1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2026-06-20 16:32:28 +02:00
Commit Graph

2690 Commits

Author SHA1 Message Date
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
Gerkiz 70bb37d7bf wagon out of map fix 2021-07-27 21:22:52 +02:00
Gerkiz 8da00da125 Merge branch 'develop' into develop 2021-07-26 21:55:42 +02:00
Gerkiz 0c8603529b Merge pull request #102 from ComfyFactory/AutostashFix
fix weird LuaInventory stutter
2021-07-26 21:55:17 +02:00
Gerkiz 034b127902 fix weird LuaInventory stutter 2021-07-26 21:53:57 +02:00
Gerkiz 62321448c7 Merge pull request #101 from ComfyFactory/tweaks
Minor adjustments
2021-07-23 17:24:28 +02:00
Gerkiz 6a165c79cb Minor adjustments 2021-07-23 17:23:33 +02:00
Gerkiz 001eb38062 Merge branch 'develop' into develop 2021-07-23 16:40:05 +02:00
Gerkiz 42e7496322 Merge pull request #100 from ComfyFactory/tweaks
Refactor of some code.
2021-07-23 16:39:56 +02:00
Gerkiz aa807a4dd0 removed weird global 2021-07-23 16:38:29 +02:00
Gerkiz f60370d103 mtn v3 - reworked how generation is done 2021-07-23 16:38:23 +02:00
Gerkiz ba4c612055 corpse marker - minor bug fix 2021-07-23 16:36:34 +02:00
Gerkiz 1e7751f8ba check if explosives are trying to blast void 2021-07-23 16:36:24 +02:00
Gerkiz 10fef17c52 nerf to RPG
This nerf is needed because players at level 200 can mine "safely" from being damaged by worms etc.
2021-07-23 16:36:06 +02:00
Shadow_Man a6665b0fec RU locale fixes
1. Russian locale update for RPG
2. Minor fixes to RU Mountain Fortress v3
3. Start working for localization "Journey" map
2021-07-21 03:13:29 +02:00
Gerkiz fd8c9411d1 Merge pull request #97 from Astorin/develop
Update RU locale
2021-07-20 22:25:44 +02:00
Gerkiz d5395f90a9 Merge branch 'develop' into develop 2021-07-20 22:24:43 +02:00
Gerkiz 0ea8cccf3a Merge pull request #98 from ComfyFactory/bugfixes
Bugfix
2021-07-20 22:20:33 +02:00
Gerkiz e813e875d7 Bugfix
Fixed antigrief logging limit
Fixed autostash healing/increasing durability of items
Added two new functions to session_data
2021-07-20 22:17:49 +02:00
Shadow_Man fdc425493a Merge branch 'develop' into develop 2021-07-18 17:26:13 +02:00
Shadow_Man 7f17f5af22 Update RU locale
Fully checked & translated to Russian language.

P.S. I cannot find "Journey" scenario localization strings. Is it available for translation?
2021-07-18 17:22:18 +02:00
Gerkiz 98c4beac87 Merge pull request #96 from NekoBaron/develop
fish tweeks
2021-07-18 16:04:47 +02:00
Gerkiz 9e5835a412 remove unused vars 2021-07-18 16:03:59 +02:00
Gerkiz e472043998 make luacheck happy 2021-07-18 16:02:53 +02:00
Gerkiz e9176c1360 make luacheck happy 2021-07-18 16:01:56 +02:00
NekoBaron 74bad8e026 Update table.lua
changed starting gun turret limit to 3 to try ease low player count defending early game, tweeked difficulties but left normal as is
2021-07-18 14:36:56 +01:00