2874 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	7209034d3e	Merge branch 'develop' into scrap_fixes	2022-03-01 19:20:17 +01:00
Gerkiz	5f9f1aba67	Merge pull request #224 from ComfyFactory/luacheck ... luacheck update	2022-03-01 19:19:17 +01:00
Gerkiz	dab8858fdf	luacheck update	2022-03-01 19:17:53 +01:00
Gerkiz	f065a745bb	more fixes	2022-03-01 19:16:44 +01:00
Gerkiz	0837a8d329	scrap towny ffa fixes ... Rebase from the running save	2022-03-01 18:55:02 +01:00
Gerkiz	9ff78c729f	Merge pull request #221 from ComfyFactory/planetprison_fix ... planet_prison desync fix	2022-03-01 01:00:23 +01:00
Gerkiz	a5e1f15cc2	planet_prison desync fix	2022-03-01 00:58:53 +01:00
Gerkiz	1cb79bb50d	Merge pull request #220 from ComfyFactory/planet_prison ... Planet Prison fixes	2022-03-01 00:02:41 +01:00
Gerkiz	b4a6231a4a	planet prison - fixes	2022-03-01 00:01:09 +01:00
Gerkiz	1478bbbbff	planet prison - fixes	2022-02-28 23:47:00 +01:00
Gerkiz	5ffecd97b5	Merge pull request #219 from ComfyFactory/minor_fix ... Fixes some minor modules/maps	2022-02-28 22:18:37 +01:00
Gerkiz	ec1f7eabc4	fish defender - bouncy shell minor issue fix	2022-02-28 22:16:33 +01:00
Gerkiz	47da1705f8	fish defender - minor issue fix	2022-02-28 22:16:23 +01:00
Gerkiz	8cae376904	wave defense - minor issue fix	2022-02-28 22:16:16 +01:00
Gerkiz	8194dccf56	Merge pull request #218 from ComfyFactory/mtn_v3 ... mtn v3 - fix weird bug	2022-02-27 23:18:23 +01:00
Gerkiz	465ca81fa4	make luacheck happy	2022-02-27 23:13:32 +01:00
Gerkiz	5c631e1b7f	mtn v3 - fix weird bug	2022-02-27 23:11:59 +01:00
Gerkiz	1e6d41d1ae	Merge pull request #213 from PlexPt/develop ... Update Chinese translation and Migrate some hardcoded code.	2022-02-22 22:16:37 +01:00
Gerkiz	1263d405ca	Merge branch 'develop' into develop	2022-02-22 22:14:06 +01:00
Gerkiz	89d26acd95	Merge pull request #217 from ComfyFactory/mtn_v3 ... Mtn v3 - Fixes that offline players had their vehicles removed	2022-02-22 22:07:46 +01:00
Gerkiz	06ef4ad7e8	mtn v3 - small fix	2022-02-22 22:05:30 +01:00
Gerkiz	e4e7b6c015	Merge pull request #216 from ComfyFactory/lab_fix ... Map update and module fix	2022-02-22 21:27:36 +01:00
Gerkiz	222c81980e	Map update and module fix	2022-02-22 21:26:00 +01:00
Gerkiz	acdfa05d91	Merge pull request #215 from x2605/develop ... Fix potential game breaker - mine rock by robot	2022-02-22 20:23:00 +01:00
x2605	a3face796b	Fix potential game breaker - mine rock by robot	2022-02-23 01:36:31 +09:00
Gerkiz	d7056ff82d	Merge pull request #214 from ComfyFactory/minor_fixes ... Minor changes	2022-02-14 00:28:19 +01:00
Gerkiz	ad0f6255f7	Make luacheck happy	2022-02-14 00:27:14 +01:00
Gerkiz	b90f6f2811	Don't alert if a player has zero items in their inventory	2022-02-14 00:25:27 +01:00
Gerkiz	8ae1318c50	Don't check for entity ghosts when checking fullness	2022-02-13 23:33:10 +01:00
Gerkiz	ebb95ee000	Spam check players	2022-02-13 23:32:57 +01:00
plexpt	7e63c40550	FIX	2022-01-27 12:34:54 +08:00
plexpt	0db69db28b	Migrate some hardcoded code again	2022-01-27 12:14:04 +08:00
plexpt	baf9e1c289	Migrate some hardcoded code	2022-01-27 11:54:00 +08:00
plexpt	ae87a9adac	Update Chinese translation	2022-01-27 11:24:04 +08:00
Gerkiz	ffda7393b8	Merge pull request #211 from Quadrum1/patch-3 ... Fix serious error	2022-01-24 22:43:41 +01:00
Quadrum	eeb739a9ae	Make luacheck happy	2022-01-24 20:46:37 +01:00
Quadrum	7c202dcb76	Fix serious error ... Error was in --Friendly Fire History -> local function on_entity_died(event) There is a unique case, when an item dies and is not within blacklisted_types (belts and so on), but is within the whitelist_types array (I would guess this is for trees?), the friendy_fire history is incremented, but not checked for a limit. Previously, this was a none-issue, as the list would be cleared when any other case is trigger. Now, however, only 1 log entry is deleted when it overflows, and only without that case. So every time somebody triggers that special case, by lets say destroying a tree, the array is increased by one without removing the first entry. This should hopefully fix that.	2022-01-24 20:35:51 +01:00
Gerkiz	f3a688d3fe	Merge pull request #209 from Quadrum1/patch-2 ... Add overflow for history arrays	2022-01-19 22:42:21 +01:00
Gerkiz	fb1fd99ea5	Merge branch 'develop' into patch-2	2022-01-19 22:41:15 +01:00
Gerkiz	d8b3e355ac	Merge pull request #210 from ComfyFactory/minor_fix ... Minor fix to server select	2022-01-19 22:38:55 +01:00
Gerkiz	116a5f89d5	Merge branch 'develop' into minor_fix	2022-01-19 22:37:48 +01:00
Gerkiz	17e0988d2d	Minor fix	2022-01-19 22:36:35 +01:00
Quadrum	02f6479019	Add overflow for history arrays	2022-01-19 21:16:35 +01:00
Gerkiz	07251991a8	Merge pull request #205 from Agocelt/develop ... Spidertrons warning message	2022-01-19 17:30:02 +01:00
Gerkiz	09bcdab575	Merge branch 'develop' into develop	2022-01-18 15:23:52 +01:00
Gerkiz	cb822bdc45	Merge pull request #208 from ComfyFactory/server_select ... server select - fix tooltip and various things	2022-01-18 15:05:14 +01:00
Gerkiz	8eb6765aa4	fix local	2022-01-18 15:04:23 +01:00
Gerkiz	f4b9bc5de0	server select - fix tooltip and various things	2022-01-18 15:02:39 +01:00
Gerkiz	b82d0f125f	Merge pull request #207 from ComfyFactory/code_cleanup ... Remove unused global	2022-01-18 00:12:26 +01:00
Gerkiz	4f2097ca73	Remove unused global	2022-01-18 00:11:20 +01:00