3527 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
blubFisch	f2d00b122b	Merge branch 'develop' into develop-blub	2022-10-04 15:56:38 +01:00
Gerkiz	b221cd1cf8	Merge pull request #317 from ComfyFactory/vacant_players ... Clear vacant players - fix breaking iterator	2022-10-04 11:22:01 +02:00
Gerkiz	7d4ac6dedb	Clear vacant players - fix breaking iterator	2022-10-04 11:19:32 +02:00
Gerkiz	46a0bf09a3	Merge pull request #316 from ComfyFactory/tweaks ... Refactor and minor changes	2022-09-30 22:26:23 +02:00
Gerkiz	b7c5fb9ffe	Remove unused modules	2022-09-30 22:24:10 +02:00
Gerkiz	1b57f00a53	Mtn v3 - only post when wave is >= 1000 to discord	2022-09-30 22:24:01 +02:00
Gerkiz	30f207da55	Refactor Scrap Towny and ix desync issues	2022-09-30 22:23:37 +02:00
Gerkiz	4aa1a1b190	Update luacheckrc	2022-09-30 22:18:31 +02:00
blubFisch	4f800fe21e	Text updates and debug info	2022-09-28 15:40:01 +01:00
Gerkiz	7be027fe0c	Merge pull request #314 from blubFisch/develop-blub ... Show player numbers in scoreboard instead of info section + Player limit	2022-09-28 16:02:47 +02:00
blubFisch	b2006912dd	Shorten survival goal	2022-09-28 15:01:04 +01:00
blubFisch	dde456958e	Remove unused variable	2022-09-28 15:00:04 +01:00
blubFisch	dee19c04ce	Remove unused variable	2022-09-28 11:12:47 +01:00
blubFisch	d187b91952	Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub	2022-09-28 10:58:25 +01:00
blubFisch	e413bd23bf	Reactivate member limit (at least for now until we have proper solution)	2022-09-28 10:58:09 +01:00
Gerkiz	db6e54cf02	Merge branch 'develop' into develop-blub	2022-09-28 11:32:01 +02:00
Gerkiz	598507ee9d	Merge pull request #313 from blubFisch/develop ... Branch off worms_create_oil_patches for Towny to rebalance for oil amount	2022-09-28 11:31:39 +02:00
blubFisch	c7ea88d6db	Show player numbers in scoreboard instead of info section	2022-09-28 10:27:58 +01:00
blubFisch	fe5824af78	Merge branch 'develop' into develop	2022-09-28 09:48:14 +01:00
Gerkiz	0bb8d99d63	Merge pull request #312 from ComfyFactory/towny ... Towny - disable show_inventory and where command.	2022-09-26 19:50:02 +02:00
Gerkiz	9b1df4aa7e	Towny - disable show_inventory and where command.	2022-09-26 19:48:50 +02:00
blubFisch	22e70ca40c	Branch off worms_create_oil_patches for Towny and rebalance for oil scarcity	2022-09-23 12:46:44 +01:00
Gerkiz	2c80e082ac	Merge pull request #311 from ComfyFactory/fv2 ... Fish v2 - fix error in difficulty	2022-09-23 10:40:21 +02:00
Gerkiz	21c2375e5e	Fish v2 - fix error in difficulty	2022-09-23 10:38:52 +02:00
Gerkiz	19936ca41e	Merge pull request #310 from ComfyFactory/towny_fixes ... Towny fixes	2022-09-22 22:16:57 +02:00
Gerkiz	44cd85e9ed	Towny fixes	2022-09-22 22:14:23 +02:00
Gerkiz	53a611f5dd	Merge pull request #309 from ComfyFactory/towny ... Towny small changes	2022-09-22 20:44:08 +02:00
Gerkiz	e9b7789f5a	Towny small changes	2022-09-22 20:42:46 +02:00
Gerkiz	8e79d3c800	Towny small fix	2022-09-22 20:25:08 +02:00
Gerkiz	d03e49c538	Merge pull request #308 from ComfyFactory/towny-changes ... Merges towny changes from blubFisch	2022-09-22 20:22:33 +02:00
Gerkiz	6b5edd5a4b	Add towny to panel	2022-09-22 20:20:12 +02:00
Gerkiz	3d856551b4	Towny - merge upstream changes ... Changes done by blubFisch	2022-09-22 20:20:05 +02:00
Gerkiz	a89aa3e5c0	Merge pull request #307 from Agocelt/MF_fixes ... Mf fixes	2022-09-21 16:39:55 +02:00
Johny	0cc4b2a05a	Stats GUI fix	2022-09-18 11:35:24 +02:00
Johny	10b1fb18de	Locale changes	2022-09-18 11:32:16 +02:00
Johny	eb2aabb731	Stats GUI shows coins spent on train upgrades	2022-09-18 11:10:58 +02:00
Johny	8e7c92df45	Fixing aura market limit and chest icon	2022-09-18 10:31:10 +02:00
Gerkiz	7367f78817	Merge pull request #306 from ComfyFactory/modulefix ... Fix weird gui on launch fish to win module	2022-09-15 00:03:00 +02:00
Gerkiz	6379675a75	Fix weird gui on launch fish to win module	2022-09-15 00:01:51 +02:00
Gerkiz	0aec08449a	Merge pull request #305 from danielmartin0/develop ... Pirate Ship v1.3.5	2022-09-13 23:21:37 +02:00
danielmartin0	89ecd34edf	Update .gitignore	2022-09-13 22:19:44 +01:00
danielmartin0	3880a5a446	luacheck	2022-09-13 22:10:53 +01:00
danielmartin0	b3fb6040a3	luacheck	2022-09-13 22:09:25 +01:00
danielmartin0	bbc71d6a3e	Update .gitignore	2022-09-13 22:06:13 +01:00
danielmartin0	d10c9206c2	Merge branch 'develop' into develop	2022-09-13 22:03:59 +01:00
danielmartin0	6c61dac590	Update pirates.cfg	2022-09-13 22:03:07 +01:00
Gerkiz	c788309d63	Wave defense - minor fix	2022-09-07 21:37:15 +02:00
Gerkiz	84d3fb1719	Jail data - minor fix	2022-09-03 21:44:27 +02:00
Gerkiz	a47a50ade0	Merge pull request #304 from ComfyFactory/improv ... Fixes and tweaks	2022-09-03 21:28:54 +02:00
Gerkiz	7b7967cabc	Merge branch 'develop' into improv	2022-09-03 21:28:03 +02:00