1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-03 13:12:11 +02:00

3078 Commits

Author SHA1 Message Date
danielmartin0
9b44587aa1 Delete MacOS.gitignore 2022-03-30 00:59:34 +01:00
danielmartin0
0dd1904b3b Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop 2022-03-30 00:58:03 +01:00
danielmartin0
2376863df6 no changes; cache refresh 2022-03-30 00:58:02 +01:00
Gerkiz
26aa773788
Merge pull request #236 from ComfyFactory/gui_fix
Fix minor gui issue
2022-03-29 22:27:32 +02:00
Gerkiz
fc43ef8618 set default to false 2022-03-29 22:26:09 +02:00
Gerkiz
7cf25ff1c0 Fix minor gui issue 2022-03-29 22:24:58 +02:00
Gerkiz
7f7aa3a470
Merge branch 'develop' into develop 2022-03-29 21:55:34 +02:00
Gerkiz
da10bf40dc
Merge pull request #235 from ComfyFactory/minor_fixes
minor fix
2022-03-29 21:36:27 +02:00
Gerkiz
60625c9103
Merge branch 'develop' into minor_fixes 2022-03-29 21:35:39 +02:00
Gerkiz
e5611d8a3c minor fix 2022-03-29 21:35:00 +02:00
Gerkiz
67b953b39d
Merge pull request #234 from ComfyFactory/fixes
Fix freeplay and fish defender
2022-03-29 20:14:29 +02:00
Gerkiz
b7315b5980 Fix freeplay and various other files 2022-03-29 20:12:50 +02:00
danielmartin0
0ff31e14cf tiny patch 2022-03-29 13:09:06 +01:00
Eric Anderson
b724de5fbb bugfix: change to have more resources accidentally applied to corridors 2022-03-28 22:02:22 -07:00
Eric Anderson
e44d0ef3f6 tweak resources in treasure biome down by 2x it was too high 2022-03-28 22:00:13 -07:00
danielmartin0
413a8fd7c5 patch 2022-03-29 00:36:38 +01:00
danielmartin0
cc7de75e61 v1.1.1.5.2 2022-03-28 00:40:32 +01:00
danielmartin0
129a94aad9 comment back in require 'maps.pirates.main' 2022-03-25 17:57:58 +00:00
danielmartin0
d87e3eb13f commenting out require 'maps.pirates.main' 2022-03-20 11:41:34 +00:00
danielmartin0
4b1949c4a1 patch 2022-03-20 11:41:23 +00:00
danielmartin0
c0185d42d2 luacheck fix 2022-03-19 21:22:57 +00:00
danielmartin0
a9d6120b58 Merge remote-tracking branch 'upstream/develop' into develop 2022-03-19 21:21:09 +00:00
danielmartin0
ce80f3e108 update for luacheck 2022-03-19 21:20:55 +00:00
danielmartin0
282f28567a fix 2022-03-19 00:10:16 +00:00
danielmartin0
e87ab12db6 v1.1.1.5.1, preparing for PR 2022-03-19 00:09:30 +00:00
Gerkiz
d096d4ca4e minor fix 2022-03-17 12:23:16 +01:00
danielmartin0
446971f70e v1.1.1.5.0 2022-03-17 01:40:18 +00:00
danielmartin0
b068529190 v1.1.1.4.2 2022-03-16 15:01:50 +00: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
danielmartin0
e757c82661 v1.1.1.4 2022-03-15 18:50:19 +00: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
danielmartin0
81db6a80bc v1.1.1.2 2022-03-14 21:38:44 +00:00
danielmartin0
4d2e6fd7da v1.1.1.2 2022-03-14 17:37:18 +00:00
danielmartin0
3406def506 v1.1.1.1 2022-03-14 12:44:30 +00: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
danielmartin0
e6df3a60a4 v1.1.1.0 2022-03-13 18:19:59 +00:00
danielmartin0
a1d26c0d58 v1.1.0.4 2022-03-13 10:55:04 +00:00
danielmartin0
9125ab5351 v1.1.0.3 2022-03-13 02:09:21 +00:00
danielmartin0
d2ecd38764 v1.1.0.2 2022-03-13 01:44:32 +00:00
Shadow_Man
7f6862bd9c
RU locale update 2022-03-12 19:21:32 +02:00
danielmartin0
221455c27b final pre-launch patch (notes update) 2022-03-12 12:00:14 +00:00
danielmartin0
e53e9aa19a patch 2022-03-12 11:51:11 +00:00