Commit graph

3959 commits

Author SHA1 Message Date
Pyritie
5c2689b707 asdf 2025-07-17 00:40:08 +01:00
Xikaro
2c60f3d4e7 fix: let-me-despawn & mega 2025-07-17 04:34:31 +05:00
Xikaro
2204e1b325 fix: iris-flywheel-compat & jade-addons 2025-07-17 04:29:22 +05:00
Xikaro
47a0ac8d48 fix: hypertubes & ferritecore 2025-07-17 04:25:43 +05:00
Xikaro
041d8916bb fix: chalk & chunky & create_factory_logistics 2025-07-17 04:12:36 +05:00
Xikaro
b44ba09d11 fix: astikor-carts-tfc & astikor-carts-redux 2025-07-17 04:03:00 +05:00
Xikaro
a711f24dd7 fix: moonlight & arborfirmacraft 2025-07-17 04:00:21 +05:00
Xikaro
0bd9cd457c fix: ae2 & advancedperipherals & almanac 2025-07-17 03:55:49 +05:00
Pyritie
21f0acd1ea update changelog 2025-07-16 23:55:44 +01:00
Pyritie
8c445ad1e4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-16 22:16:53 +01:00
Pyritie
2d3976182d fix for #1356 because firmaciv won't do it themselves 2025-07-16 22:16:48 +01:00
Pyritie
c49d0f0138 quest tweak 2025-07-16 13:02:09 +01:00
GameStar
0a32609a4b
Feature: Tier 2 insulation (#1349)
* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* models

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* textures

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* ad as

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update tags.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update items.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update materials.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-16 12:05:10 +01:00
Redeix
2855552f11
Some fixes (#1353)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-16 09:18:54 +01:00
Gifpxto
f5c97ca618
Begin Portuguese (Brazil) translation of Field Guide content (#1352)
* add pt_br lang for categories folder in the field guide

* add pt_br entries for irrigation and hazards  to the field guide
2025-07-16 09:16:39 +01:00
Xikaro
de174fe3b9 add: pakku.jar 1.2.1 2025-07-16 13:04:43 +05:00
Pyritie
bc4e38c087 I believe this should be client side? 2025-07-16 00:49:07 +01:00
Pyritie
e72a0dd0b3 added phantoms to the last two beneath biomes cuz why not 2025-07-15 23:43:55 +01:00
Pyritie
d9b15ddaa6 changelog 2025-07-15 23:25:35 +01:00
Pyritie
bd625ee7d3 increased max distance of rope (and elevator?) pulleys #1347 2025-07-15 23:24:22 +01:00
Pyritie
c7831a072e fixed duplicate pizza dough 2025-07-15 23:22:41 +01:00
Pyritie
3760367600 primitive creatures tweaks 2025-07-15 23:21:40 +01:00
Pyritie
0e881871e9 fixed primitive creatures spawning 2025-07-15 23:12:53 +01:00
Pyritie
0da8506b4e pt-br for ores field guide 2025-07-15 23:02:56 +01:00
Pyritie
0753b9b932 langs 2025-07-15 23:02:21 +01:00
Pyritie
915ac436b2 update everycomp, fzzyconfig, packetfixer 2025-07-15 22:59:23 +01:00
Pyritie
fce575fc95 update primitive creatures 2025-07-15 22:36:09 +01:00
Pyritie
b24ac77bb3 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-15 22:29:56 +01:00
Redeix
31b6da9f1c
Integrated Ad Astra wood & and added wood recipe utility (#1346)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 17:41:08 +01:00
TomPlop
5a567b959b
Update quests alpha 0 10 (#1345)
* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog
2025-07-15 16:32:49 +01:00
Xikaro
cbe1d18df7 fix: detected-setblock-be-gone 2025-07-15 18:38:36 +05:00
Xikaro
c63e0935b7 fix: geckolib & every-compat 2025-07-15 18:23:54 +05:00
Xikaro
fb12a1cae8 fix: gtceu & greate 2025-07-15 18:17:48 +05:00
Xikaro
9fa31fa19d fix: pandas-falling-trees & inventory-tweaks-refoxed 2025-07-15 18:10:30 +05:00
Xikaro
3d33d77f07 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-15 18:02:47 +05:00
Xikaro
0994fc6577 fix: bookshelf & pandalib 2025-07-15 18:02:45 +05:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337)
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
2025-07-15 11:48:00 +01:00
Xikaro
a75febb28a Update pakku-lock.json 2025-07-15 14:34:55 +05:00
Xikaro
c81fffe46f Update pakku.json 2025-07-15 12:34:46 +05:00
Redeix
28d87caae3
Harvest baskets + (#1338)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 03:37:45 +01:00
Pyritie
d036c4c960 fixed the stressometer recipe disappearing 2025-07-15 02:48:37 +01:00
Pyritie
8e3fe6d528 fixed anthracite not working with blaze burners 2025-07-15 01:55:36 +01:00
Pyritie
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Pyritie
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +01:00
Pyritie
5849b84d46 fixed rotten cheese in moon quest reward 2025-07-14 20:00:13 +01:00
Pyritie
84750a0607 langs 2025-07-14 20:00:01 +01:00
Pyritie
2fde4c9265 fixed the pump models 2025-07-14 19:05:15 +01:00
Pyritie
bc926c34f1 removed create old copper texture resource pack, updated pakku, removed the mods that xikaro wanted that prevent a modrinth release 2025-07-14 18:50:16 +01:00
Pyritie
9b10264c30 create + greate config fixes + tweaks 2025-07-14 18:49:47 +01:00
Redeix
911ede670a
Created utility function to add circuit numbers to pre-existing recipes (#1320)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-14 10:10:37 +01:00