Pyritie
3d1e167387
quest merging
2025-06-23 22:41:04 +01:00
Pyritie
4ae60492d4
aircraft configs
2025-06-18 01:27:34 +01:00
Pyritie
ddf9851a42
chicken
2025-06-17 20:07:59 +01:00
Pyritie
e38425d597
removed old refrigerator, added conversion to new one
2025-06-17 14:47:42 +01:00
Pyritie
c13edcabdc
merge food branch into space branch
2025-06-17 12:12:43 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
...
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge"
2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
...
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232
merge
2025-06-17 01:02:15 +01:00
Pyritie
7f11bed7eb
quest updates, langs
2025-06-16 18:37:24 +01:00
Pyritie
8bc9247b24
nerfed durability of wooden tongs, slightly tweaked their recipe
2025-06-16 17:42:01 +01:00
Pyritie
8b18a4c7a6
update greenhouse quest
2025-06-12 21:52:37 +01:00
Pyritie
b7cc04f188
merge
2025-06-12 13:33:44 +01:00
Pyritie
4d492e261d
added lunchbox quest
2025-06-10 17:06:45 +01:00
Pyritie
c91f8efe0e
changed LV optional quests to correctly have the heart icon
2025-06-10 17:06:14 +01:00
Pyritie
faa21ecbab
removed giselle quest
2025-06-09 23:33:14 +01:00
Pyritie
9c41fe262f
merge
2025-06-09 21:15:19 +01:00
Pyritie
86a35b7386
turned on the EMI default recipe button by default
2025-06-09 20:50:40 +01:00
Pyritie
1a5867d956
fixes #1107
2025-06-09 18:59:05 +01:00
TomPlop
e4014d1d6e
Small fixes for Empty Jar, Beekeeper quest and Assembler Chute ( #1142 )
...
* Fix Chute Assembler recipe
* Fix quest tips beekeper
* Fix for wine and jar alloy smelter conflicting recipe
* fix to fit #1141
* mistakes were made
* Fix jetpack 1 quest mv
* Mistake again
* Revert the fix on chute
2025-06-08 22:22:01 +01:00
Pyritie
2180da4932
cc recipe tweaks
2025-06-07 20:06:27 +01:00
Pyritie
04a57e48db
Merge branch 'dev' into feature/space
2025-06-07 11:24:51 +01:00
Pyritie
80fff75580
fixes #1130
2025-06-05 21:44:37 +01:00
Pyritie
263a9dfab7
merge
2025-06-05 12:24:32 +01:00
TomPlop
955a838aca
Quests work (Langfile, WIP) ( #1126 )
2025-06-04 23:24:40 +01:00
Pyritie
076775bfc5
Merge branch 'dev' into feature/space
2025-06-02 23:07:47 +01:00
Spicy Noodles
52dcc54089
Add Optional Bacon Quest ( #1122 )
...
* Add bacon quest
* Fix merging issue
* Changelog
---------
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-02 15:45:47 -05:00
ofoxsmith
c87af7bf16
Change lv chem reactor quest to require any container with rubber instead of a rubber bucket ( #1116 )
...
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-02 11:07:24 -05:00
eso
043e1655d0
add the create toolbox to the list of unsortable inventories ( #1120 )
...
* add the create toolbox to the list of unsortable inventories
* changelog update
2025-06-02 11:05:15 -05:00
Pyritie
a79652844d
merge
2025-06-01 21:18:02 +01:00
Xikaro
cec84cef50
fix #1102
2025-06-01 19:54:53 +05:00
Pyritie
050c90ae35
I finally found that pesky "combatting lag" quest
2025-05-31 19:35:02 +01:00
Pyritie
3f0206f35c
ore processing chapter tweaks
2025-05-31 19:34:49 +01:00
Pyritie
0b47224d98
added better aqueous accumulator machine textures, added a quest for it, rearranged LV a bit because it was getting cramped
2025-05-31 15:14:03 +01:00
Redeix
e0cbe907f4
Trowel item ( #1106 )
...
* - Changed the weird assembler piston recipe.
* - Updated Changelog
* - Added Trowel tool.
- Increased size of piglin disguise to prevent texture clipping.
* - Updated Changelog
2025-05-31 11:35:36 +01:00
Pyritie
3055a9a230
removed dogs and cats from the carryon whitelist because it was getting in the way of the keybind to assign commands to them
2025-05-30 22:45:40 +01:00
Xikaro
ef3fe83260
pakku
2025-05-30 02:56:54 +05:00
Xikaro
06b24095ab
Merge branch 'main' into dev
2025-05-30 01:36:38 +05:00
Pyritie
1305d713f4
merge
2025-05-29 21:01:25 +01:00
Pyritie
7a0c4b02d7
quests
2025-05-28 22:32:06 +01:00
Pyritie
c8c0c06a1e
I know tom wants to overhaul the ae2 quests with space but we might as well fix the broken ores one in the meantime
2025-05-28 22:31:47 +01:00
Pyritie
fbbac7b70b
quests
2025-05-27 22:41:48 +01:00
Pyritie
bc49d77568
quests
2025-05-27 21:28:52 +01:00
Pyritie
5eccb4e4a3
quests
2025-05-27 20:45:54 +01:00
Pyritie
0467750da5
quests
2025-05-27 20:14:33 +01:00
Pyritie
928e6084c1
Merge branch 'dev' into feature/space
2025-05-27 19:52:59 +01:00
Deneth Weerasinghe
7cf7778ed0
re-organise boat quests, added horse and astikor quests, misc. positioning ( #1077 )
...
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-05-27 11:05:14 -05:00
Pyritie
d3ea33096b
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-05-22 13:14:54 +01:00
Pyritie
e9da541595
changed double ingot quests to only need a single item instead of 7
2025-05-22 13:14:51 +01:00
Redeix
e3c11b1e88
Added Piglin disguise. ( #1058 )
...
* - Added piglin disguise.
* - Updated Changelog
2025-05-22 10:18:16 +01:00
