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

3018 Commits

Author SHA1 Message Date
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
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
Gerkiz
280720ec46
Merge pull request #206 from ComfyFactory/server_connect
Add the ability to connect to other servers via ingame gui
2022-01-18 00:08:31 +01:00
Gerkiz
bd906f8e7f Add the ability to connect to other servers via ingame 2022-01-18 00:07:25 +01:00
Johny
4258e1830f Spidertrons warning message 2022-01-16 20:37:27 +01:00
Gerkiz
547c6dadd4
Merge pull request #204 from ComfyFactory/changes
User requested changes
2022-01-14 22:56:57 +01:00
Gerkiz
49f342d3fd rpg - future fix 2022-01-14 22:53:27 +01:00
Gerkiz
d909dc42ba Wave defense - minor change 2022-01-14 22:50:49 +01:00
Gerkiz
f463ad71d6 Mtn v3 - adjust the car price as per vote request 2022-01-14 22:12:28 +01:00
Gerkiz
1fa63ba251 Mtn v3 - change layout tile inside the "surface" locomotives 2022-01-14 22:12:11 +01:00
Gerkiz
0e6b406567 Mtn v3 - adjust discharge cost 2022-01-14 22:11:54 +01:00
Gerkiz
aea8596ccd Fish v2 - add more difficulties when playing solo 2022-01-14 22:05:01 +01:00
Gerkiz
7750b47722 Wave defense - user requested feature
Prints a popup to pause the wave defense waves for 5 minutes. Requires 50% of connected players to have voted.
2022-01-14 21:58:43 +01:00
Gerkiz
4f16030532 Mtn v3 - user requested feature
Changes mining ore chances
2022-01-14 21:02:35 +01:00
Gerkiz
c7fd81da94
Merge pull request #203 from ComfyFactory/changes
Minor changes
2022-01-14 16:21:05 +01:00
Gerkiz
c287e06fd0 Make luacheck happy 2022-01-14 16:20:15 +01:00
Gerkiz
9c7dc00021 Mtn v3 - user requested feature
You can now toggle auto upgrade when placing vehicles.
2022-01-14 16:17:24 +01:00