1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

2997 Commits

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
danielmartin0
2e0b514889 v1.0.3.9.4 2022-03-01 15:57:23 +00: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
danielmartin0
6b49234f4c hotfix 2022-02-28 20:40:29 +00:00
danielmartin0
3a89db4a0a v1.0.3.9.2 2022-02-28 20:35:45 +00:00
danielmartin0
4ef9d1b61a v1.0.3.9.1 2022-02-28 16:36:46 +00: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
danielmartin0
f4bdebe2f3 v1.0.3.8.3 2022-02-27 18:47:53 +00:00
danielmartin0
27ba3e5dff v1.0.3.8.2 2022-02-27 16:42:25 +00:00
danielmartin0
57713f55aa v1.0.3.7 2022-02-26 23:33:19 +00:00
danielmartin0
20de9a40e0 v1.0.3.6 2022-02-26 18:25:48 +00:00
danielmartin0
1f74257cf1 v1.0.3.5 2022-02-26 13:55:36 +00:00
danielmartin0
512481c758 v1.0.3.2 2022-02-25 00:15:32 +00:00
danielmartin0
80de04709c v1.0.3.1 2022-02-25 00:01:28 +00:00
danielmartin0
c59e80161a Merge remote-tracking branch 'upstream/develop' into develop 2022-02-24 19:41:03 +00:00
danielmartin0
7ef06c265f 1.0.3.0 2022-02-24 19:39:03 +00: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
danielmartin0
cc46f618dd v1.0.2.1 2022-02-22 19:40:30 +00: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