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

1926 Commits

Author SHA1 Message Date
Gerkiz
9cbfbb0196 more fixes 2020-07-30 19:09:18 +02:00
Gerkiz
0e8945d7f7 tweaks and minor fixes 2020-07-30 17:47:50 +02:00
hanakocz
6716201d71 MultiDungeons 2020-07-29 21:28:48 +02:00
Gerkiz
e449e827ee added more functions to rpg 2020-07-29 20:24:32 +02:00
MewMew
280563d91a terrain things 2020-07-29 20:14:39 +02:00
hanakocz
8f972198ed
Merge pull request #26 from M3wM3w/master
minor tweak
2020-07-29 19:39:36 +02:00
Gerkiz
d6d5cfdeba minor tweak 2020-07-29 19:32:05 +02:00
hanakocz
6e0359cebe
Merge pull request #25 from M3wM3w/master
update from main
2020-07-29 19:31:51 +02:00
Gerkiz
106148f674 minor fixes 2020-07-29 19:30:45 +02:00
Gerkiz
7836b4b61d magic fix 2020-07-29 19:29:29 +02:00
hanakocz
01624d7309
Merge pull request #24 from M3wM3w/master
update from main
2020-07-29 18:22:34 +02:00
Gerkiz
2b63282d79 add one more check 2020-07-29 10:45:41 +02:00
Gerkiz
7d7c649e05 fixed minor bug 2020-07-29 10:43:15 +02:00
Gerkiz
20fa0e187f minor fix 2020-07-29 10:23:41 +02:00
Gerkiz
9d0e808985 minor fix 2020-07-28 20:09:48 +02:00
Gerkiz
fb8c153cc5 tweaks 2020-07-28 19:55:28 +02:00
Gerkiz
5957ab4997
Merge pull request #185 from hanakocz/master
nuclear landmines module
2020-07-28 19:19:29 +02:00
Gerkiz
4e75239efd bug fixes 2020-07-28 16:48:55 +02:00
hanakocz
eda38113e8 WD - fix for player's spawners would block creating spawners 2020-07-28 13:35:32 +02:00
hanakocz
3318856a51
Merge pull request #23 from M3wM3w/master
update from main
2020-07-28 13:33:16 +02:00
Gerkiz
e36702e038 tweaks and fixes 2020-07-28 11:24:16 +02:00
Gerkiz
9d1653d687 tweaks and fixes 2020-07-27 11:07:32 +02:00
Gerkiz
c670ce2380 minor modifications 2020-07-26 22:06:19 +02:00
Gerkiz
fb97c7e6bc new module and minor changes 2020-07-26 17:14:57 +02:00
Gerkiz
ea5fea5c98 safe updates? 2020-07-25 22:22:21 +02:00
hanakocz
49f434c089 nuclear landmines module 2020-07-25 20:54:54 +02:00
hanakocz
7c1730cf6a
Merge pull request #22 from M3wM3w/master
update from main
2020-07-25 20:53:37 +02:00
Gerkiz
979a9b5d9b minor fix 2020-07-25 19:05:02 +02:00
Gerkiz
0e8e6f4a02 refactor 2020-07-25 17:22:04 +02:00
Gerkiz
ae718e358d
Merge pull request #184 from hanakocz/master
charging station and rpg small fixes
2020-07-25 16:38:55 +02:00
Gerkiz
92cb69c367 tweaks and fixes 2020-07-24 17:33:28 +02:00
hanakocz
5b6b1d48b5 fix for RPG deleting unit from HP pool before granting XP for more HP 2020-07-24 15:10:20 +02:00
hanakocz
f6aaecdf36 charging station and rpg small fixes 2020-07-24 10:20:03 +02:00
hanakocz
594c850839
Merge pull request #21 from M3wM3w/master
update from main
2020-07-24 02:50:10 +02:00
MewMew
0f4cf43078 more config options 2020-07-23 09:00:36 +02:00
Gerkiz
aa340491d5
Merge pull request #183 from llorephie/CraftingGriefPrevention-20200721
Make crafting grief prevention more aggressive! (and not abusive to server)
2020-07-22 19:13:55 +02:00
Gerkiz
5b60da71d2 fixes 2020-07-22 18:58:42 +02:00
MewMew
4a6559e342 map ping on token use 2020-07-22 14:47:12 +02:00
MewMew
caba716520 map ping when chest is unlocked 2020-07-22 12:25:33 +02:00
MewMew
ca7fd371d1 leavers drop their tokens 2020-07-22 09:12:04 +02:00
MewMew
93f883ddd1 map description 2020-07-22 06:12:45 +02:00
MewMew
162d1e1e9a update 2020-07-22 05:59:32 +02:00
hanakocz
8bc260c276
Merge pull request #20 from M3wM3w/master
update from main
2020-07-21 20:44:10 +02:00
MewMew
1a32dfd061 fix 2020-07-21 19:52:35 +02:00
MewMew
23d5c1aefb tweak & fix 2020-07-21 19:25:00 +02:00
MewMew
6b94bf1737 new map 2020-07-21 17:42:38 +02:00
MewMew
383aeb787c wip map 2020-07-21 15:40:59 +02:00
Gerkiz
2840367b0a minor changes 2020-07-21 14:41:39 +02:00
Gerkiz
f25c81ee6b
Merge pull request #182 from hanakocz/master
rpg fix for getting xp, bonus hp -> bonus xp even if killed by turret
2020-07-21 14:39:09 +02:00
Maxim Martyanov
e3837464b0
Count in addition to inventory full player's inventory size to be sure it can hold everything without invalidation. 2020-07-21 15:14:54 +03:00