games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-22 03:38:48 +02:00
Code Issues Releases Activity
3,894 Commits 2 Branches 470 Tags
Commit Graph

3894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piratux
e75091009d Added science packs to labs in radioactive island 
Changes:
- Added science packs to labs in radioactive island.
 2022-10-04 21:43:11 +03:00
Piratux
077df6c208 Raffle bandaid fix + added cave island to rotation 
Changes:
- Made quest structures return random requirement item when raffle returns nil. This happens because some items have negative weights in lambda raffle.
- Added Cave island to B and D island categories.
 2022-10-04 21:28:35 +03:00
Gerkiz
2589a68ad8
Merge pull request #319 from ComfyFactory/towny 
Towny - fix bugs
1.0.39 		2022-10-04 17:53:23 +02:00
Gerkiz
f12a3d7d16 Towny - fix bugs 2022-10-04 17:51:22 +02:00
Gerkiz
08dea44480
Merge pull request #318 from blubFisch/develop-blub 
Cleanup and re-import resource balance
1.0.38 		2022-10-04 17:50:10 +02:00
Gerkiz
8bd87edf62
Remove XDB logging as it fills the log. 2022-10-04 17:48:39 +02:00
blubFisch
25781a5288 Reduce rock ores 2022-10-04 16:44:42 +01:00
blubFisch
30b21af2da Add hint about mining productivity upgrade 2022-10-04 16:37:29 +01:00
blubFisch
ca2a7f449c Restore MGS settings: low-yield generated patches 2022-10-04 16:32:28 +01:00
blubFisch
557ab6621b More scrap 2022-10-04 16:12:06 +01:00
blubFisch
95c1f5b1ea Refactor - move last of the custom scripts to towny map 2022-10-04 16:03:00 +01:00
blubFisch
f2d00b122b Merge branch 'develop' into develop-blub 2022-10-04 15:56:38 +01:00
Gerkiz
b221cd1cf8
Merge pull request #317 from ComfyFactory/vacant_players 
Clear vacant players - fix breaking iterator
1.0.37 		2022-10-04 11:22:01 +02:00
Gerkiz
7d4ac6dedb Clear vacant players - fix breaking iterator 2022-10-04 11:19:32 +02:00
Piratux
8542a783cf New cave island 
Changes:
- New island: Mysterious caves
- New market offers: logistic chests
 2022-10-03 00:37:54 +03:00
Gerkiz
46a0bf09a3
Merge pull request #316 from ComfyFactory/tweaks 
Refactor and minor changes
1.0.36 		2022-09-30 22:26:23 +02:00
Gerkiz
b7c5fb9ffe Remove unused modules 2022-09-30 22:24:10 +02:00
Gerkiz
1b57f00a53 Mtn v3 - only post when wave is >= 1000 to discord 2022-09-30 22:24:01 +02:00
Gerkiz
30f207da55 Refactor Scrap Towny and ix desync issues 2022-09-30 22:23:37 +02:00
Gerkiz
4aa1a1b190 Update luacheckrc 1.0.35 2022-09-30 22:18:31 +02:00
blubFisch
4f800fe21e Text updates and debug info 2022-09-28 15:40:01 +01:00
Gerkiz
7be027fe0c
Merge pull request #314 from blubFisch/develop-blub 
Show player numbers in scoreboard instead of info section + Player limit
1.0.34 		2022-09-28 16:02:47 +02:00
blubFisch
b2006912dd Shorten survival goal 2022-09-28 15:01:04 +01:00
blubFisch
dde456958e Remove unused variable 2022-09-28 15:00:04 +01:00
blubFisch
dee19c04ce Remove unused variable 2022-09-28 11:12:47 +01:00
blubFisch
d187b91952 Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub 2022-09-28 10:58:25 +01:00
blubFisch
e413bd23bf Reactivate member limit (at least for now until we have proper solution) 2022-09-28 10:58:09 +01:00
Gerkiz
db6e54cf02
Merge branch 'develop' into develop-blub 2022-09-28 11:32:01 +02:00
Gerkiz
598507ee9d
Merge pull request #313 from blubFisch/develop 
Branch off worms_create_oil_patches for Towny to rebalance for oil amount
1.0.33 		2022-09-28 11:31:39 +02:00
blubFisch
c7ea88d6db Show player numbers in scoreboard instead of info section 2022-09-28 10:27:58 +01:00
blubFisch
fe5824af78
Merge branch 'develop' into develop 2022-09-28 09:48:14 +01:00
Gerkiz
0bb8d99d63
Merge pull request #312 from ComfyFactory/towny 
Towny - disable show_inventory and where command.
1.0.32 		2022-09-26 19:50:02 +02:00
Gerkiz
9b1df4aa7e Towny - disable show_inventory and where command. 2022-09-26 19:48:50 +02:00
blubFisch
22e70ca40c Branch off worms_create_oil_patches for Towny and rebalance for oil scarcity 2022-09-23 12:46:44 +01:00
Gerkiz
2c80e082ac
Merge pull request #311 from ComfyFactory/fv2 
Fish v2 - fix error in difficulty
1.0.31 		2022-09-23 10:40:21 +02:00
Gerkiz
21c2375e5e Fish v2 - fix error in difficulty 2022-09-23 10:38:52 +02:00
Gerkiz
19936ca41e
Merge pull request #310 from ComfyFactory/towny_fixes 
Towny fixes
1.0.30 		2022-09-22 22:16:57 +02:00
Gerkiz
44cd85e9ed Towny fixes 2022-09-22 22:14:23 +02:00
Gerkiz
53a611f5dd
Merge pull request #309 from ComfyFactory/towny 
Towny small changes
1.0.29 		2022-09-22 20:44:08 +02:00
Gerkiz
e9b7789f5a Towny small changes 2022-09-22 20:42:46 +02:00
Gerkiz
8e79d3c800 Towny small fix 1.0.28 2022-09-22 20:25:08 +02:00
Gerkiz
d03e49c538
Merge pull request #308 from ComfyFactory/towny-changes 
Merges towny changes from blubFisch
1.0.27 		2022-09-22 20:22:33 +02:00
Gerkiz
6b5edd5a4b Add towny to panel 2022-09-22 20:20:12 +02:00
Gerkiz
3d856551b4 Towny - merge upstream changes 
Changes done by blubFisch
 2022-09-22 20:20:05 +02:00
Gerkiz
a89aa3e5c0
Merge pull request #307 from Agocelt/MF_fixes 
Mf fixes
1.0.26 		2022-09-21 16:39:55 +02:00
danielmartin0
4c6701ef39 Update merchants.lua 2022-09-18 14:43:30 +01:00
danielmartin0
4c68fe9b3b Update merchants.lua 2022-09-18 14:43:18 +01:00
danielmartin0
5912ce09ea Update merchants.lua 2022-09-18 14:43:08 +01:00
Johny
0cc4b2a05a Stats GUI fix 2022-09-18 11:35:24 +02:00
Johny
10b1fb18de Locale changes 2022-09-18 11:32:16 +02:00