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

2815 Commits

Author SHA1 Message Date
Gerkiz
02e07be286 mtn v3 - fix power dedup 2021-10-06 00:01:05 +02:00
Gerkiz
2381fff310
Merge branch 'develop' into develop 2021-10-05 22:41:52 +02:00
Gerkiz
485b76c966
Merge branch 'develop' into patch-2 2021-10-05 22:41:46 +02:00
Gerkiz
9b485bb112
Merge pull request #120 from ComfyFactory/fix-wierd-link
fix weird link in readme
2021-10-03 22:34:49 +02:00
Gerkiz
55ba66ba5f
fix weird link in readme 2021-10-03 22:32:36 +02:00
Gerkiz
8e973b9dc8
Merge pull request #119 from Agocelt/Disabling-research-with-no-use
Disabling research with no use
2021-10-03 22:31:17 +02:00
Agocelt
77adad0491
Disabling research with no use 2021-10-03 20:50:53 +02:00
Gerkiz
4ce8f19bc0
Merge branch 'develop' into develop 2021-10-02 21:42:08 +02:00
Gerkiz
19733772d1
Merge branch 'develop' into patch-2 2021-10-02 21:42:03 +02:00
Gerkiz
8adc192285
Merge pull request #117 from ComfyFactory/mtn_v3
Mountain Fortress v3 fixes
2021-10-02 21:40:51 +02:00
Gerkiz
af84582559
Merge branch 'develop' into mtn_v3 2021-10-02 21:40:02 +02:00
Gerkiz
3732d06457
Merge pull request #118 from ComfyFactory/add_templates
new templates
2021-10-02 21:39:41 +02:00
Gerkiz
00d41fd9d3 new templates 2021-10-02 21:36:37 +02:00
Gerkiz
9517bd7187
Merge pull request #115 from Agocelt/Market-counter
Counter for main upgrades in locomotive's market
2021-10-02 21:29:32 +02:00
Gerkiz
01aa68efad mtn v3 - more fixes 2021-10-02 21:15:31 +02:00
Gerkiz
eaf20f1158 mtn v3 - fix of broken core feature 2021-10-02 21:04:15 +02:00
Agocelt
14b87531c3
Update locomotive.lua 2021-10-01 14:22:09 +02:00
Agocelt
c43c9e9e6f
Update mtn_fortress_v3.cfg 2021-10-01 14:19:51 +02:00
Agocelt
015977afa8
Update mtn_fortress_v3.cfg 2021-10-01 14:19:22 +02:00
Agocelt
5f5d60e3c8
Update mtn_fortress_v3.cfg 2021-10-01 14:18:43 +02:00
Gerkiz
1beb9cf945
Merge branch 'develop' into develop 2021-09-19 08:46:25 +02:00
Gerkiz
8ea28f7e50
Merge branch 'develop' into patch-2 2021-09-19 08:46:19 +02:00
Gerkiz
3eb239b21f
Merge pull request #112 from ComfyFactory/mtn_v3_Fix
mtn v3 - portable cars fix
2021-09-19 08:45:59 +02:00
Gerkiz
ebedcb2de4 mtn v3 - portable cars fix 2021-09-19 08:45:11 +02:00
Gerkiz
c7dbcaf385
Merge branch 'develop' into develop 2021-09-17 22:31:46 +02:00
Gerkiz
d6c45e0f00
Merge branch 'develop' into patch-2 2021-09-17 22:31:41 +02:00
Gerkiz
19e999fd0c
Merge pull request #111 from ComfyFactory/update_readme
update readme
2021-09-17 22:31:21 +02:00
Gerkiz
96032a467d update readme 2021-09-17 22:30:34 +02:00
Gerkiz
36efe52ada
Merge branch 'develop' into develop 2021-09-17 22:29:33 +02:00
Gerkiz
52222b64b8
Merge branch 'develop' into patch-2 2021-09-17 22:29:27 +02:00
Gerkiz
8307f53b95
Merge pull request #110 from ComfyFactory/mtn_v3_enable_decon
mtn v3 - enable decon
2021-09-17 22:29:03 +02:00
Gerkiz
dd39386717 mtn v3 - enable decon 2021-09-17 22:28:18 +02:00
Gerkiz
ef206e3013
Merge pull request #109 from ComfyFactory/mtn_v3
mtn v3
2021-09-17 22:26:59 +02:00
Gerkiz
09b060b5ac mtn v3
Added "Deconstruction" on Config tab
Enables deconstruction on cars/tanks/trains.
2021-09-17 22:26:13 +02:00
Gerkiz
56bdf9d55c
Merge branch 'develop' into patch-2 2021-08-21 12:48:20 +02:00
Gerkiz
e5dd5d8be5
Merge pull request #108 from ComfyFactory/mtn_v3_fix
minor tweaks to mtn v3
2021-08-21 12:48:09 +02:00
Gerkiz
524fb9715c
Merge branch 'develop' into mtn_v3_fix 2021-08-21 12:47:27 +02:00
Gerkiz
8af9ab97a1
Merge pull request #107 from Agocelt/develop
Fix for wagons spawning out of reach
2021-08-21 12:47:17 +02:00
Gerkiz
2a8fb1e92f minor tweaks to mtn v3 2021-08-21 12:46:10 +02:00
Agocelt
2895789614
Update table.lua 2021-08-21 09:39:12 +02:00
Shadow_Man
5c9b0a2536
Merge branch 'develop' into patch-2 2021-08-04 21:24:10 +02:00
Shadow_Man
21a5da3a52
Merge branch 'develop' into develop 2021-08-04 21:22:13 +02:00
Gerkiz
f6ef4f8bd4
Merge pull request #106 from ComfyFactory/mtn_v3
increase tick speed for terrain
2021-08-03 23:06:39 +02:00
Gerkiz
69650051a5 increase tick speed for terrain 2021-08-03 23:05:03 +02:00
Shadow_Man
43d9a96cce
Fix wrong "world number selection" to Discord 2021-08-02 10:44:17 +02:00
Shadow_Man
1e7ad1d692
Merge branch 'develop' into develop 2021-07-30 15:12:37 +02:00
Gerkiz
d05f1dfd55
Merge pull request #104 from ComfyFactory/autostash_update
refactor to ItemStacks, fixes armor modules, durability, deleting items
2021-07-29 20:22:06 +02:00
hanakocz
8d7bf8865f refactor to ItemStacks, fixes armor modules, durability, deleting items 2021-07-28 22:32:50 +02:00
Gerkiz
c198c03d53
Merge pull request #103 from ComfyFactory/fixes
Minor changes to autostash and terrain to mtn v3
2021-07-27 21:23:59 +02:00
Gerkiz
10a524716c autostash fix 2021-07-27 21:22:56 +02:00