2424 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	6eb2547e49	make luacheck happy	2021-04-20 15:45:12 +02:00
MewMew	8825d3fe02	NEW MAP	2021-04-19 21:09:00 +02:00
Quadrum	82b094d16d	Update group.lua ... Allows group name and description to include spaces and punctuation characters.	2021-04-16 23:04:13 +02:00
hanakocz	c49c57e965	Merge pull request #24 from ComfyFactory/chronotrain_fix_gui ... fix for gui crash + poison hidden upgrade spam	2021-04-14 18:33:54 +02:00
hanakocz	328e292be5	fix for gui crash + poison hidden upgrade spam	2021-04-14 18:31:38 +02:00
Gerkiz	b2b60d95fa	Merge pull request #23 from ComfyFactory/biter_health_booster ... biter health booster fix	2021-04-04 19:31:49 +02:00
Gerkiz	01d0aa2617	biter health booster fix	2021-04-04 19:30:47 +02:00
Gerkiz	7b20f887cd	Merge pull request #22 from ComfyFactory/various_tweaks ... Various tweaks to modules and maps	2021-04-04 13:52:46 +02:00
Gerkiz	f76af8c582	debug and desync fixes	2021-04-04 13:51:27 +02:00
Gerkiz	eef1c3f57a	planet prison fixes	2021-04-04 13:50:24 +02:00
Gerkiz	80736a24d5	mtn fortress fixes	2021-04-04 13:50:17 +02:00
Gerkiz	3bd965ce3b	Merge pull request #21 from ComfyFactory/planet_prison_and_biter_battles ... minor fixes to planet prison and biter battles	2021-04-01 22:12:09 +02:00
Gerkiz	164a911f42	make luacheck happy	2021-04-01 22:10:19 +02:00
Gerkiz	fbda17b3aa	removed unused functions and fixed so water is not generated near spawn	2021-04-01 22:07:46 +02:00
Gerkiz	4f484de35a	add biter battles to discord channels	2021-04-01 22:06:55 +02:00
Gerkiz	cfed977076	planet prison fixes	2021-04-01 22:06:44 +02:00
Gerkiz	e22fe4316a	Merge pull request #20 from ComfyFactory/various_fixes ... Minor tweaks to biter battles and prison planet	2021-03-30 16:13:34 +02:00
Gerkiz	61462ddd80	planet_prison fixes	2021-03-30 16:11:39 +02:00
Gerkiz	bbb5b4f5e2	biter_battle_v2 - added some options to config	2021-03-30 16:10:10 +02:00
Gerkiz	91d7d8ba6d	Merge pull request #19 from ComfyFactory/debug_features ... enable feature on /debug command	2021-03-28 17:02:43 +02:00
Gerkiz	d12b4423db	enable feature on /debug command	2021-03-28 17:01:39 +02:00
Gerkiz	8920aff657	Merge pull request #18 from ComfyFactory/planet_prison_fixes ... Planet Prison fixes	2021-03-28 17:00:58 +02:00
Gerkiz	9f0c17eac5	Merge branch 'develop' into planet_prison_fixes	2021-03-28 17:00:12 +02:00
Gerkiz	022a8a31ef	more minor changes to planet prison	2021-03-28 16:59:14 +02:00
Gerkiz	3475bc8373	planet prison fixes	2021-03-28 16:58:54 +02:00
Gerkiz	27428b27c0	Merge pull request #15 from Quadrum1/junkyard-fix ... Junkyard fix / scrap.lua	2021-03-27 14:53:53 +01:00
Gerkiz	eba5098af9	Merge branch 'develop' into junkyard-fix	2021-03-27 14:52:52 +01:00
Gerkiz	aac2bb0365	Merge pull request #17 from ComfyFactory/planet_prison_adjustments ... planet_prison minor adjustments	2021-03-27 14:50:13 +01:00
Gerkiz	7af801b21d	remove unused local	2021-03-27 14:49:13 +01:00
Gerkiz	3e0e4841a1	planet_prison minor adjustments	2021-03-27 14:47:47 +01:00
Gerkiz	01dfffa392	Merge pull request #16 from ComfyFactory/mtn_and_prison_fix ... minor changes to planet prison and mtn fortress	2021-03-27 13:50:28 +01:00
Gerkiz	92688aea74	minor changes to planet prison and mtn fortress	2021-03-27 13:44:32 +01:00
Quadrum	36fa0f3b68	Fixing weird formatting	2021-03-26 17:53:46 +01:00
Quadrum	1a48cbdf60	Update junkyard to 1.1	2021-03-26 17:47:30 +01:00
Gerkiz	5a0d34fa5d	Merge pull request #14 from ComfyFactory/player_list_fix ... fixed minor human error	2021-03-26 00:15:29 +01:00
Gerkiz	b995b206de	fixed minor human error	2021-03-26 00:14:14 +01:00
Gerkiz	6675456486	Merge pull request #13 from ComfyFactory/comfy_panel_tabs_rework ... removed comfy_panel_tabs from _G and made it use tokens instead	2021-03-25 23:51:44 +01:00
Gerkiz	5b88f8fdfc	removed comfy_panel_tabs from _G and made it use tokens instead	2021-03-25 23:49:57 +01:00
hanakocz	d2b56a1c7f	Merge pull request #12 from ComfyFactory/luacheck_fix_chrono ... fix luacheck in chrono	2021-03-25 20:50:16 +01:00
hanakocz	c40f8c97ee	plsss	2021-03-25 20:45:04 +01:00
hanakocz	11449f0302	plss	2021-03-25 20:41:22 +01:00
hanakocz	b3423a9c83	pls	2021-03-25 20:37:35 +01:00
hanakocz	35ccbaf258	last luacheck fixes	2021-03-25 20:34:51 +01:00
hanakocz	9f8a7de980	more lua fixes	2021-03-25 03:49:03 +01:00
hanakocz	09bac50da6	fix luacheck in chrono	2021-03-25 03:39:07 +01:00
Gerkiz	001bfe9b6e	Merge pull request #11 from ComfyFactory/attempt_to_fix_luacheck_warnings ... Attempt to fix luacheck warnings	2021-03-24 20:54:35 +01:00
Gerkiz	52f3976337	luacheck fixes	2021-03-24 20:23:53 +01:00
Gerkiz	e2a33f9f30	luacheck more fixes	2021-03-24 20:14:55 +01:00
Gerkiz	b582b3cb9b	luacheck fixes	2021-03-24 19:18:46 +01:00
Gerkiz	3e297f96d1	Merge remote-tracking branch 'origin/develop' into attempt_to_fix_luacheck_warnings	2021-03-24 19:18:30 +01:00