1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-30 23:17:53 +02:00
Commit Graph

3983 Commits

Author SHA1 Message Date
Gerkiz
fae172e856 Labyrinth - small fix 2022-11-15 22:40:38 +01:00
Gerkiz
76ee1c12b8
Merge pull request #355 from danielmartin0/develop
small balance patch to pirates
2022-11-13 23:19:05 +01:00
Gerkiz
385fef72ce
Merge branch 'develop' into develop 2022-11-13 22:53:19 +01:00
Gerkiz
25eb4ffa0e
Merge pull request #352 from Astorin/develop
RU locale update
2022-11-13 22:52:23 +01:00
Gerkiz
ac28e269b2
Merge branch 'develop' into develop 2022-11-13 22:49:51 +01:00
danielmartin0
53823b51e5 Update overworld.lua 2022-11-13 21:21:02 +00:00
danielmartin0
273623fa4d Merge remote-tracking branch 'upstream/develop' into develop 2022-11-13 21:18:25 +00:00
danielmartin0
ce6c9d7a23 small balance patch 2022-11-13 21:17:46 +00:00
Gerkiz
482d83bc7e
Merge pull request #354 from ComfyFactory/pirates
Pirates - add the ability to toggle crew disband via config
2022-11-08 22:17:46 +01:00
Gerkiz
dbf857b75e
Merge branch 'develop' into develop 2022-11-08 22:00:47 +01:00
Gerkiz
01bdf4a607 Config - small text edit 2022-11-08 21:56:39 +01:00
Gerkiz
bfaea6e5c8 Pirates - add the ability to toggle crew disband via config 2022-11-08 21:55:40 +01:00
Gerkiz
dd5f9b85e3
Merge pull request #353 from ComfyFactory/mtn_v3_fixes
Mtn v3 - minor fixes
2022-11-08 00:11:06 +01:00
Gerkiz
bc45c4a165 Mtn v3 - minor fixes 2022-11-08 00:09:19 +01:00
hanakocz
c6c42f8d2a
Merge branch 'develop' into develop 2022-11-07 14:59:15 +01:00
Gerkiz
c8db36bc4f Jaildata - fix date issue 2022-11-04 22:39:29 +01:00
Gerkiz
db618b4db8 Merge remote-tracking branch 'origin/develop' into develop 2022-11-04 19:01:31 +01:00
Gerkiz
0d91a9015a Jaildata - fix date issue 2022-11-04 19:01:11 +01:00
Shadow_Man
3ec6e2c609
RU locale update
Minor updates to locale, mtn_fortress_v3, rpg, wave_defense and HUGE update for pirates.
2022-11-03 17:43:32 +02:00
Piratux
a8f45265b4 Description fix
Changes:
- Fixed cannon description in dock market
2022-11-01 20:04:08 +02:00
Gerkiz
bbddb0328f
Merge pull request #350 from Piratux/develop
Bug fixes and dock market offer tweaks
2022-10-31 12:18:27 +01:00
Piratux
c472de54be Bug fixes and dock market offer tweaks
Changes:
- Cannon upgrade is now more expensive and appears less often.
- Rocket/merchant upgrades are now on fixed location (600L: rockets, 760L: merchants).
- Fixed an error that would upgrade cannons when buying rocket/merchant upgrade in dock.
- Fixed power upgrade appearing in dock.
- Fixed an error when player killed itself.
- Fixed derp emoji not working on discord.
- Fixed respawn speed bonus not working.
2022-10-30 23:25:30 +02:00
Gerkiz
94a8a2e72d
Merge pull request #349 from Piratux/develop
Merge fix
2022-10-29 12:40:14 +02:00
Piratux
81905d9d7c Merge branch 'develop' of https://github.com/Piratux/ComfyFactorio-Pirates into develop 2022-10-29 13:30:17 +03:00
Piratux
00395ecc6c Merge fix 2022-10-29 13:30:06 +03:00
Gerkiz
0cee6f5f73
Merge pull request #348 from Piratux/develop
Pirate ship 1.4.0 update

> > @danielmartin0 are these changes OK to merge? 🦖
> 
> Yep, happy to trust @Piratux's judgement. (I also don't have capacity to review atm)

Great to hear! I'll merge these changes.
2022-10-29 11:59:05 +02:00
Piratux
f02d9274cf
Merge branch 'develop' into develop 2022-10-28 17:12:57 +03:00
Piratux
6c14997498 Merge remote-tracking branch 'upstream/develop' into develop 2022-10-28 16:53:02 +03:00
Piratux
9dc0a145ed Warning fixes 2022-10-28 16:22:59 +03:00
Piratux
595f6d2cf3 Discord tech print fix + green water for radioactive island
Changes:
- Radioactive island now has green water (as well as small green brightness that's only seen at night slightly).
- Reduced base amount of resource count quest item requirement by 10%.
- Fixed research tech unintentionally printing to discord when crew disbands.
2022-10-28 15:21:31 +03:00
Gerkiz
dc6a3a4e36 Mtn v3 - fix minor issue 2022-10-27 15:51:17 +02:00
Gerkiz
c42591effd
Merge pull request #347 from ComfyFactory/mtn_v3
Refactor and fixes
2022-10-26 00:27:42 +02:00
Gerkiz
9b2e4a2675 Soft reset - minor fix 2022-10-26 00:26:33 +02:00
Gerkiz
5410f00758 Fix luacheck 2022-10-26 00:22:57 +02:00
Gerkiz
6cf1e9eea0 Mtn v3 - final fixes 2022-10-26 00:21:53 +02:00
Gerkiz
e2ee3d6446 Mtn v3 - more fixes 2022-10-26 00:05:47 +02:00
Gerkiz
1dc46a00d4 Mtn v3 - refactor and make one single module 2022-10-25 23:29:40 +02:00
Gerkiz
c752395ec1 BottomFrame - add new event 2022-10-25 23:02:19 +02:00
Gerkiz
9966b76aff Antigrief - minor nil check 2022-10-25 22:43:54 +02:00
Gerkiz
54e705ca18 Mtn v3 - init spectate 2022-10-25 20:52:59 +02:00
Gerkiz
dac63a3b2e Fix render beam 2022-10-25 20:52:44 +02:00
Gerkiz
67eb88808f
Merge pull request #346 from ComfyFactory/fixes
Fixes to autostash and Mtn v3
2022-10-25 20:11:38 +02:00
Gerkiz
1f746dcd94 Mtn v3 - normalize difficulties 2022-10-25 20:10:18 +02:00
Gerkiz
d7bf9ac171 Fix autostash modded bug 2022-10-25 20:09:55 +02:00
hanakocz
733b51ee1f
Merge pull request #345 from ComfyFactory/small_refactor
landmine module changes, towny optimization for mining, small fixes
2022-10-24 19:05:59 +02:00
hanakocz
56befa681d landmine module changes, towny optimization for mining, small fixes 2022-10-24 19:00:48 +02:00
Piratux
cdc3e62674 Updated "Updates" section 2022-10-23 22:13:46 +03:00
Piratux
2226c9bcf5 Discord message fixes
Changes:
- When crew loses, leagues achieved will be printed in discord as well.
- Fixed deprecated emojis
2022-10-23 19:03:43 +03:00
Piratux
ab0d10030e Artillery turret upgrade bug fix
Changes:
- Fixed an issue where players could get artillery turret when buying the upgrade with full inventory.
2022-10-23 16:50:48 +03:00
Piratux
f539fe2fb5 Hold and power purchase changes
Changes:
- Extra hold and power upgrades now can only be purchased at captain's cabin instead of docks.
2022-10-23 15:16:39 +03:00