1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-01 13:08:05 +02:00

2929 Commits

Author SHA1 Message Date
Gerkiz
d096d4ca4e minor fix 2022-03-17 12:23:16 +01:00
Gerkiz
bc56388028
Merge pull request #230 from Astorin/develop
RU locale update
2022-03-15 20:12:05 +01:00
Gerkiz
eea9f7e441
Merge branch 'develop' into develop 2022-03-15 20:04:30 +01:00
Gerkiz
507472cb73
Merge pull request #231 from ComfyFactory/fixes
Minor fixes
2022-03-15 20:02:10 +01:00
Gerkiz
d8066b5ee7 Rework jail permissions 2022-03-15 20:00:00 +01:00
Gerkiz
a2a0e92ad1 Minor change 2022-03-15 19:59:44 +01:00
Gerkiz
840937015b Fix deep jungle 2022-03-15 19:59:38 +01:00
Eric Anderson
43e7be2337 Make treasure rooms unbounded but lower frequency the more that appear 2022-03-15 00:02:05 -07:00
Eric Anderson
e91d492a93 Fix sundry bugs in the changelog implementation 2022-03-15 00:01:32 -07:00
Eric Anderson
212447a654 Bugfix: not op binds more tightly than >, so not abs(v) < w becomes (not abs(v)) < w which makes lua sad.
Also fix island to have water all around the outside. After refactor it
became clear the logic was probably missing the second not.
2022-03-14 23:58:24 -07:00
Eric Anderson
c99d36f40d Rebalance ores, noop spaghetti mode, add changelog 2022-03-13 21:25:58 -07:00
Eric Anderson
87a9c5de43 Add changelog module to the panel 2022-03-13 21:18:42 -07:00
Shadow_Man
7f6862bd9c
RU locale update 2022-03-12 19:21:32 +02:00
Eric Anderson
c737a8a679 Disable collapse and spaghetti mode 2022-03-06 23:40:37 -08:00
Eric Anderson
1a080bb95a Nerf ore from rocks. Old formula hit its maximum on floor 2, new formula hits max on floor 19. Tweak resoruce distribution so less stone is generated on the lower levels and the distribution is closer to the all-science distribution 2022-03-06 23:40:11 -08:00
Eric Anderson
73b5d03276 Add ability to entirely disable collapse. It is used by RPG and causes log spamming (12G log when noticed) because it can not collapse in tiered dungeon 2022-03-06 23:37:16 -08:00
Eric Anderson
64fd0338d8 Add ability to make spaghetti setting a no-op, otherwise the config overrides dungeons settings for research 2022-03-06 23:36:18 -08:00
Eric Anderson
f526609a5b Lots more tweaking of the distribution so it is more even across floors. Special case automation so it is always found first on floor 0. 2022-03-06 23:35:30 -08:00
Gerkiz
c55edffc12
Merge pull request #229 from ComfyFactory/changes
Minor changes and tweaks
2022-03-06 00:41:29 +01:00
Gerkiz
e8deb4ae08 minor fix 2022-03-06 00:35:33 +01:00
Gerkiz
1c205b8580 disable map 2022-03-06 00:35:07 +01:00
Gerkiz
a19b5e8132 enable module in control 2022-03-06 00:34:28 +01:00
Gerkiz
6dcacbcb52 fix groups 2022-03-06 00:34:22 +01:00
Gerkiz
4edfd949d1 fix hunger games 2022-03-06 00:34:05 +01:00
Gerkiz
acba7ebfe1 use _G where we can 2022-03-06 00:33:54 +01:00
Gerkiz
87a5796a08 spam protect - disable warnings 2022-03-06 00:33:35 +01:00
Gerkiz
590b58504c fix deep_jungle 2022-03-06 00:33:21 +01:00
Gerkiz
980a97d1cb
Merge pull request #228 from ComfyFactory/groups
fix groups
2022-03-05 18:29:41 +01:00
Gerkiz
5cd6691645 fix groups 2022-03-05 18:28:03 +01:00
Gerkiz
4937172d6e
Merge pull request #227 from ComfyFactory/disable_module
disable inserter_drops_pickup since it's causing desyncs
2022-03-05 17:51:25 +01:00
Gerkiz
7fc0be44c7 disable inserter_drops_pickup since it's causing desyncs 2022-03-05 17:50:02 +01:00
Gerkiz
2a984b8b1b
Merge pull request #226 from ComfyFactory/scrap_towny
scrap towny ffa fixes
2022-03-01 19:34:25 +01:00
Gerkiz
1a7d6f1c77 make luacheck happy 2022-03-01 19:33:13 +01:00
Gerkiz
0191cf5e5d scrap towny ffa fixes 2022-03-01 19:31:57 +01:00
Gerkiz
01dc8160b8
Merge pull request #225 from ComfyFactory/scrap_fixes
scrap towny ffa fixes
2022-03-01 19:21:14 +01:00
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