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

374 Commits

Author SHA1 Message Date
danielmartin0
e955b9e6e1 debug fix 2022-06-03 20:56:55 +01:00
danielmartin0
7af59ec7ff Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop 2022-06-03 20:50:33 +01:00
danielmartin0
6ca581877b adjust: cannon resistance again
we need to make cannon HP go up with the dock upgrade
2022-06-03 20:48:23 +01:00
Piratux
214cdd9b23 requested changes for class update PR 2022-06-03 22:38:46 +03:00
Piratux
ce1a603bfa In progress 2022-06-02 16:07:17 +03:00
danielmartin0
ab7fa21fea main tick reordering 2022-06-01 22:13:09 +01:00
danielmartin0
281d22bb94 header on each file; clamp function; locale fixes 2022-06-01 19:50:36 +01:00
danielmartin0
db6d13c609 unrequire pirates 2022-05-31 00:11:17 +01:00
danielmartin0
8b02ea5b8f patch parrot silo warning 2022-05-31 00:11:03 +01:00
danielmartin0
02ba5bfac4 main repo consistency typo 2022-05-30 11:15:34 +01:00
danielmartin0
ba68ba3abd unrequire pirates for comfy repo pr 2022-05-30 10:09:37 +01:00
danielmartin0
e3e58e3596 debug off 2022-05-29 16:27:29 +01:00
danielmartin0
f365dd87b4 bugfixes 2022-05-29 16:27:04 +01:00
danielmartin0
4e26741d67 debug off 2022-05-29 12:44:54 +01:00
danielmartin0
acdc7369b3 fix: structure generation issue on swamp 2022-05-26 12:47:05 +01:00
hanakocz
50469c804b bp requesting - player can disable the feature in config menu 2022-05-16 01:02:25 +02:00
Gerkiz
24d65cb06d
fix small whitespace 2022-04-10 11:32:32 +02:00
danielmartin0
4203f740f2 adapt to new Comfy Gui 2022-04-08 23:44:41 +01:00
Gerkiz
7f8ad0b184 small tweak 2022-04-08 22:39:15 +02:00
danielmartin0
52ccfecb2d whitespace 2022-04-08 14:55:53 +01:00
danielmartin0
12473c7f6d re-enable some utils.gui that should be enabled on main branch 2022-04-08 14:54:22 +01:00
danielmartin0
9e4211605a prepare for PR 2022-04-08 14:49:53 +01:00
danielmartin0
e598976ede Merge remote-tracking branch 'upstream/develop' into develop 2022-04-08 14:46:11 +01:00
Gerkiz
bdd16d9a2f minor change 2022-04-08 00:35:03 +02:00
Gerkiz
6e98f1c1bc final fix 2022-04-08 00:11:10 +02:00
Gerkiz
2880571e6a minor change 2022-04-08 00:08:40 +02:00
Gerkiz
95f2e90e55 refactor more gui 2022-04-05 19:28:08 +02:00
Gerkiz
7f7aa3a470
Merge branch 'develop' into develop 2022-03-29 21:55:34 +02:00
Gerkiz
b7315b5980 Fix freeplay and various other files 2022-03-29 20:12:50 +02: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
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
danielmartin0
a8d823e46d debug off 2022-03-11 22:54:19 +00:00
danielmartin0
ee370c9bb3 v1.1.0.0 2022-03-11 22:53:36 +00:00
danielmartin0
960b234807
Merge branch 'ComfyFactory:develop' into develop 2022-03-07 22:13:21 +00:00
danielmartin0
2386fdc426 fix 2022-03-06 01:05:42 +00:00
danielmartin0
561672881c v1.0.4.3 2022-03-06 01:05:26 +00: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
7fc0be44c7 disable inserter_drops_pickup since it's causing desyncs 2022-03-05 17:50:02 +01:00
danielmartin0
798aac043e debug off 2022-03-01 22:00:26 +00:00
danielmartin0
cf6cc52c4d v1.0.3.9.6 2022-03-01 21:59:48 +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
bd906f8e7f Add the ability to connect to other servers via ingame 2022-01-18 00:07:25 +01:00
hanakocz
dfa4b2598b New module - automatically fill placed turrets with ammo 2021-12-25 23:54:27 +01:00