1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-14 02:34:09 +02:00
Commit Graph

4702 Commits

Author SHA1 Message Date
Gerkiz
7565520ead Fix max_health, item rename 2024-10-14 23:47:22 +02:00
danielmartin0
e34e9536b3 pirates: prevent autostash in captain's cabin chests 2024-10-14 15:31:53 +01:00
danielmartin0
f2e3f04790 pirates: correct market refund formula 2024-10-13 22:51:35 +01:00
danielmartin0
20d34d3c7c elite biters performance improvements 2024-10-13 15:01:00 +01:00
danielmartin0
4c85f65f56 pirates: fix handcrafting+power armor corner case 2024-10-11 13:37:02 +01:00
danielmartin0
f2cb603939 pirates: port more 1.1 tweaks 2024-10-11 13:27:33 +01:00
danielmartin0
429132e594 pirates: port player.surface 2024-10-11 12:28:06 +01:00
hanakocz
26e4b8c6ea Merge branch 'develop' of https://github.com/Gerkiz/ComfySA into develop 2024-10-10 23:12:38 +02:00
hanakocz
ddf04060ff Journey update - vanilla 2024-10-10 23:12:14 +02:00
danielmartin0
9a475f7e7e pirates: fix shotgun buff 2024-10-10 20:09:08 +01:00
danielmartin0
fa562b001c pirates: fix offline inventory recovery with power armor 2024-10-10 19:52:37 +01:00
hanakocz
cbcbcb1ce5 use new helpers 2024-10-10 20:19:55 +02:00
danielmartin0
735bfc98e9 pirates: fix upgrade affecting weapon speed 2024-10-10 16:01:13 +01:00
hanakocz
850ca108fd Expanse updated to 2.0 - vanilla 2024-10-09 21:35:16 +02:00
hanakocz
4390688f88
Merge pull request #9 from Gerkiz/daniel/entity
.created_entity -> .entity
2024-10-09 21:25:40 +02:00
danielmartin0
50d4117ff1 .created_entity -> .entity 2024-10-09 18:45:35 +01:00
hanakocz
709e48ba03 chronotrain update for current version 2024-10-08 22:44:40 +02:00
danielmartin0
ffdc8091a9 Fix raffle function insert calls 2024-10-08 20:04:13 +01:00
danielmartin0
bb088f780d fix raffle import path 2024-10-08 11:50:31 +01:00
danielmartin0
d5c337a91c pirates: missing command explanation 2024-10-07 23:35:50 +01:00
danielmartin0
6097643827 Merge branch 'develop' of https://github.com/Gerkiz/ComfySA into develop 2024-10-04 18:12:03 +01:00
danielmartin0
eaf44f1a7e active_mods 2024-10-03 23:36:04 +01:00
danielmartin0
4fcf393939
Merge pull request #8 from Gerkiz/danel/utils-math-2
/utils/math pt 2 (v2)
2024-10-03 23:35:51 +01:00
danielmartin0
dd4ebe5aea utils/math pt2 2024-10-03 23:35:18 +01:00
danielmartin0
2bd92f7008 math fixes 2024-10-03 23:23:12 +01:00
danielmartin0
39a40ca68a pirates: fix victorious check 2024-10-03 22:14:15 +01:00
danielmartin0
91097c9b7e
Merge pull request #4 from Gerkiz/daniel/utils
/utils/math
2024-10-03 22:09:57 +01:00
hanakocz
866ae8aedc
Merge pull request #7 from Gerkiz/chronotrain_1
Initial chrono port
2024-10-03 00:43:18 +02:00
hanakocz
3e7ff79e40 Initial chrono port 2024-10-03 00:38:48 +02:00
danielmartin0
c9a5f786f3 Update geometry.lua 2024-10-02 17:00:27 +01:00
danielmartin0
f7018c4f67 sum any number of vectors 2024-10-02 16:24:54 +01:00
danielmartin0
57c313d0eb
Merge pull request #6 from Gerkiz/daniel/pirates-2
Pirates: Correct decoratives
2024-10-02 15:42:18 +01:00
danielmartin0
54a40a2f82 correct decoratives 2024-10-02 15:40:31 +01:00
danielmartin0
48c629c506 more standard argument ordering on clamp (function not used so far) 2024-10-01 18:58:01 +01:00
danielmartin0
a5f2456c6f Remove points_in_m20t20_squared_sorted_by_distance_to_origin 2024-10-01 18:58:01 +01:00
danielmartin0
28c7fb1b15 Update math.lua 2024-10-01 18:58:01 +01:00
danielmartin0
e477bee324 v1
Revert "Fix 'player' shadowing in flying_texts.lua"

This reverts commit 40805e68e3c0bf588b40f510d5c32b66ecca4717.

Fix 'player' shadowing in flying_texts.lua

all_central_positions_within_area

utils/math/raffle
2024-10-01 18:58:01 +01:00
danielmartin0
bdbb5252bf Add .stylua.toml to .gitignore 2024-10-01 18:57:40 +01:00
danielmartin0
63e677542a
Merge pull request #3 from Gerkiz/daniel/pirates
Pirates: Formatting and further 2.0 porting
2024-10-01 16:54:21 +01:00
danielmartin0
7f1d36e94c unused imports 2024-10-01 14:12:16 +01:00
danielmartin0
aed37ed838 switch to repo tick_tack_trap 2024-10-01 14:06:55 +01:00
danielmartin0
1c8ff5afb0 Stylua pt2 2024-10-01 14:03:21 +01:00
danielmartin0
9cbaa8867c Don't set numbers in localized strings 2024-10-01 14:03:21 +01:00
danielmartin0
733dfb8edc remove spectator mode 2024-10-01 14:03:21 +01:00
danielmartin0
be9530dc01 Updates to account for remote view 2024-10-01 14:03:21 +01:00
danielmartin0
ac2aafbbf8 Fix message colors 2024-10-01 14:03:21 +01:00
danielmartin0
8ede47ae0e format with StyLua 2024-10-01 14:03:21 +01:00
danielmartin0
d8a876eb9d code cleanup 2024-10-01 14:03:21 +01:00
danielmartin0
16b55c4f4a pirates local 1 2024-10-01 14:03:21 +01:00
hanakocz
a8c343042d
Merge pull request #2 from Gerkiz/utils-traps-update
utils - traps fixed and added optional force parameter
2024-10-01 01:31:05 +02:00