Redeix
e7f1198cf6
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# kubejs/assets/tfg/blockstates/large_nest_box.json
# kubejs/assets/tfg/blockstates/large_nest_box_warped.json
2025-08-23 14:25:33 -05:00
Redeix
5e47c4a2ef
git moment
2025-08-23 14:25:24 -05:00
TomPlop
2ebfaf2e3a
Board rework ( #1679 )
...
* fix board
* remove from tag
* more update
* last changes
* Add new quests
* fix the weird file
* Fixes
* fix quest optional
2025-08-23 14:13:07 -05:00
Pyritie
ac99b9db87
Solar tweaks ( #1678 )
...
* solar tweaks
* langs
2025-08-23 18:30:27 +01:00
Pyritie
fa67078182
added moon rabbits and birts to the carryon whitelist
2025-08-23 17:16:46 +01:00
Pyritie
47c0d51d8d
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-08-23 17:12:27 +01:00
Pyritie
18f37c23fa
removed campfire from passive heaters
2025-08-23 17:12:25 +01:00
Pyritie
de0d71a066
create additions is a buggy ass mod
2025-08-23 17:11:49 +01:00
Frédéric Nieto
c7769c1382
fix: Fixed Oven quest after tongs were removed, still need russian localization update ( #1677 )
2025-08-23 16:53:12 +01:00
Pyritie
8335dcc19a
pakku
2025-08-23 15:01:12 +01:00
Pyritie
3b57773792
langs
2025-08-23 13:03:23 +01:00
Pyritie
a3f9193001
changed steel mech saw back to cobalt brass since you can craft it much more easily now
2025-08-23 13:01:49 +01:00
Pyritie
912bf72277
moved the lye to sodium hydroxide to the vacuumizer instead
2025-08-23 12:54:57 +01:00
Pyritie
ca8ac9d727
added some more vanilla blocks to the forge/bloomery insulation tag #1673
2025-08-23 12:37:53 +01:00
Pyritie
df9e90efa6
fix brick recipe conflict
2025-08-23 12:26:39 +01:00
Pyritie
1b8cec25ff
some new quests
2025-08-22 23:44:08 +01:00
Pyritie
bd379e106f
buffed these guys some more because goddamn the ae2 guns shred them
2025-08-22 23:19:48 +01:00
Pyritie
b87c42be06
langs
2025-08-22 23:11:35 +01:00
Pyritie
941a0e2d0c
tags to hide the sand piles from jei
2025-08-22 22:59:56 +01:00
Pyritie
d41827abdc
oh you can just change this in the config! that's cool. Also changed the infinity wand recipe
2025-08-22 22:56:06 +01:00
Pyritie
3bcbcf6d06
added recipe for new hypertube thing
2025-08-22 22:47:32 +01:00
Pyritie
3329a49049
missing hematitic sand tag
2025-08-22 22:40:54 +01:00
Pyritie
6a06eb815c
a few new ore veins
2025-08-22 22:26:56 +01:00
Pyritie
7e62c260d2
emi categories
2025-08-22 22:00:09 +01:00
Pyritie
e76bed1b25
langs
2025-08-22 21:59:42 +01:00
Pyritie
7b3f4e8726
fix #1672
2025-08-22 21:53:02 +01:00
Pyritie
46b6a2da60
gregtech papyrus tweaks
2025-08-22 21:27:18 +01:00
Pyritie
acc03bbe72
removed portable energy interface because it doesn't work with FE converters
2025-08-22 21:22:04 +01:00
Pyritie
0e151376ea
fixed alabaster
2025-08-22 21:21:47 +01:00
Pyritie
bbdeb9ba12
reduced food oven recipes from 1A LV to slightly-less-than-1A LV
2025-08-22 15:10:26 +01:00
Pyritie
55b56630eb
changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function
2025-08-22 12:49:53 +01:00
TomPlop
6eb2de0220
Mars ressources ( #1569 )
...
* stupid git again
* First entry for the mars ore line
* Adding the Ostrum Harvester in its first version
* Adding new casings
* Adding the complete Mars Ore Line
* Bugs again
* Add ores and textures
* More changes
* Changes to heavy and semi water and more fluid veins
* Adding more crafting recipes
* More recipes
* weird
* nerf ores
* fix thorium
* Adding dusty ores
* More circuits change to gate IV at the end of Mars
* Fix multiblocks
* Changes to AE2
* Unified Pattern Provider and Interface
* Removing Bedrock
* Fully remove Bedrock Miner
* Disable many stuffs until Mars
* More fixes until Mars is out
* Requested changes
* Cleaning kubejs files
* Adding Moon Ore Line
* Change Mars water to Centrifuge
* Fix duplicate
2025-08-22 12:41:27 +01:00
Gustavo
98e873cba5
add Alabaster rock crushing
2025-08-22 20:54:59 +10:00
Zippity
ba1889bf8d
fix semiheavy concurrent with tfg core ( #1671 )
2025-08-22 11:35:50 +01:00
Pyritie
33e99aedcc
cl tidying
2025-08-22 01:21:58 +01:00
Pyritie
5f5c39ea29
added armor stand shift swap #1645
2025-08-22 00:35:27 +01:00
Pyritie
09336e5e6c
cl again
2025-08-22 00:33:13 +01:00
Pyritie
37ef72ee01
shipping container dye/bleach recipes
2025-08-22 00:32:42 +01:00
Pyritie
dec69df3b9
mods can't even name themselves properly smh
2025-08-22 00:23:51 +01:00
Pyritie
fea8530ada
added higher tier greg machines
2025-08-22 00:17:27 +01:00
Pyritie
41321b1283
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-08-21 22:41:10 +01:00
Pyritie
17828ff679
fixed broken water tag for making paper, added AA recipe for spring water
2025-08-21 22:41:08 +01:00
Pyritie
3933e6bcf6
update pakku
2025-08-21 22:35:23 +01:00
Pyritie
cdd8213bed
langs
2025-08-21 22:29:55 +01:00
Pyritie
c608491857
added some more food recipes for #1638 , fixed the wrong chocolate in #1632
2025-08-21 22:19:55 +01:00
Bogdan
b192a347a9
Fix link in README ( #1668 )
...
Signed-off-by: Bogdan <57633804+bogdan-nikitin@users.noreply.github.com>
2025-08-22 01:59:49 +05:00
Pyritie
0804d81d6c
fix #1659
2025-08-21 21:39:31 +01:00
Pyritie
595ef8fdc3
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-08-21 21:37:50 +01:00
Pyritie
5e85474cf1
fix #1652
2025-08-21 21:37:46 +01:00
Frédéric Nieto
ac8f873373
fix: Fixed quests.metal_age.redblu_anvil having both steel requirements instead of one ( #1666 )
...
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-21 15:29:59 -05:00
