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

3271 Commits

Author SHA1 Message Date
Gerkiz
e85271ef2b small fixes 2022-06-10 22:06:47 +02:00
Gerkiz
8b6e72bcb1
Merge pull request #277 from ComfyFactory/mtn_v3
Super minor changes to mtn v3
2022-06-09 00:18:40 +02:00
Gerkiz
72eb252117 Mtn v3 - rename surface to hopefully lessen the ping clutter 2022-06-09 00:08:06 +02:00
Gerkiz
8bbe5278a1 Mtn v3 - switched zone walls force from player to neutral 2022-06-09 00:07:40 +02:00
Gerkiz
bd3aaeb131 Vote - fix that players could vote when timer ended 2022-06-09 00:06:38 +02:00
Gerkiz
82d81c498a
Merge pull request #276 from ComfyFactory/new-workflow
new workflow
2022-06-08 23:23:41 +02:00
Gerkiz
ae8795c844 Fix 2022-06-08 23:22:23 +02:00
Gerkiz
1e5a3fe7e5 new workflow
Checks if maps have been required in control.lua
2022-06-08 23:15:50 +02:00
Gerkiz
7d8d532c7b
Merge pull request #271 from Astorin/develop
RU locale update
2022-06-07 17:45:06 +02:00
Gerkiz
fa5e856b11
Merge branch 'develop' into develop 2022-06-07 17:43:37 +02:00
Gerkiz
b6e0f74655
Merge pull request #274 from danielmartin0/develop
Localisability for Pirates. Should be in the main comfy repo so translators know what to work with
2022-06-07 17:43:29 +02:00
Gerkiz
2a4475da41
Merge branch 'develop' into develop 2022-06-07 17:42:30 +02:00
Gerkiz
410ed2710e
Merge pull request #275 from ComfyFactory/bugfixes
Fixes
2022-06-07 17:42:06 +02:00
Gerkiz
1e3f0ff811 fix bugs 2022-06-07 17:39:57 +02:00
danielmartin0
47c7be0a68 luacheck 2022-06-06 15:55:24 +01:00
danielmartin0
ffde08ffbb unrequire pirates for pr 2022-06-06 15:41:26 +01:00
danielmartin0
39d94709df some luacheck 2022-06-05 12:02:51 +01:00
danielmartin0
685b27cbe1 version number up 2022-06-05 11:58:45 +01:00
danielmartin0
cc39d1fcee make swamp slightly nicer 2022-06-04 16:53:46 +01:00
danielmartin0
86765d7984 partial revert of laser buff against krakens 2022-06-04 16:35:51 +01:00
danielmartin0
86aaab18b9 revert 2022-06-04 16:15:40 +01:00
danielmartin0
804363c725 revert 2022-06-04 16:14:45 +01:00
danielmartin0
a4b805819a reverse some of the cost increase 2022-06-04 16:06:05 +01:00
danielmartin0
c37a1a3f3e furnace structures more common 2022-06-04 15:26:56 +01:00
danielmartin0
7175b9efe0 and again 2022-06-04 15:23:51 +01:00
danielmartin0
b5baba7a20 more pollution from silo charging hits immediately 2022-06-04 15:23:18 +01:00
danielmartin0
57bd49d2c5 comment fix 2022-06-04 15:17:41 +01:00
danielmartin0
a527b08f70 debug off 2022-06-04 14:43:21 +01:00
danielmartin0
3202f9d5cf cleanup; more treasure chests; harder electronic circuit leaving costs 2022-06-04 14:43:08 +01:00
danielmartin0
e7b3e76177 fix 2022-06-03 21:58:10 +01:00
danielmartin0
2c5e4fb46a fix: locale 2022-06-03 21:53:01 +01:00
danielmartin0
bbb9892790 in-progress changelog writeup, plus typo fix 2022-06-03 21:47:10 +01:00
danielmartin0
fa206b170b variable rename 2022-06-03 21:02:30 +01:00
danielmartin0
e955b9e6e1 debug fix 2022-06-03 20:56:55 +01:00
danielmartin0
dc5f862dc4 manual merge fix 2 2022-06-03 20:55:57 +01:00
danielmartin0
62cda272c5 manual merge issue 1 2022-06-03 20:53:31 +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
danielmartin0
cfad373816
Merge pull request #5 from Piratux/develop
Class related update
2022-06-03 20:47:53 +01:00
danielmartin0
26f00e7578 also start with a gun turret 2022-06-03 20:43:05 +01:00
Piratux
0ba747baaf Merge branch 'develop' of https://github.com/Piratux/ComfyFactorio-Pirates into develop 2022-06-03 22:42:35 +03:00
danielmartin0
bfa40aa3e0 fix: waves would sometimes try to use boat spawners 2022-06-03 20:39:37 +01:00
Piratux
214cdd9b23 requested changes for class update PR 2022-06-03 22:38:46 +03:00
danielmartin0
ccbfff87a3 buff starting items for each player 2022-06-03 20:27:47 +01:00
danielmartin0
5d32ab5e8f fix: situation in which a player joins an empty crew but isn't made captain 2022-06-03 18:59:17 +01:00
danielmartin0
31e67645bb Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop 2022-06-03 15:18:20 +01:00
danielmartin0
19530d91e5 fix banning furnaces from walkways map 2022-06-03 15:18:00 +01:00
danielmartin0
7dda920daf
Merge pull request #4 from dwightkung/develop
chinese localisation for v1.2.12
2022-06-03 14:58:40 +01:00
Piratux
918fb6476a
Merge branch 'develop' into develop 2022-06-03 16:57:06 +03:00
danielmartin0
c14ca7c37c slightly faster mining on maze island 2022-06-03 14:54:43 +01:00