Commit graph

4479 commits

Author SHA1 Message Date
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
Frédéric Nieto
b623efc894
fix: Fixed quests.metal_age.red_blu to not be stuck when migrating worlds (#1667) 2025-08-21 15:28:30 -05:00
Pyritie
d5fe25fccc why is ender chest still enabled 2025-08-21 12:41:31 +01:00
Pyritie
4395da4c2b fix #1639
Related Work Items: #1
2025-08-21 12:15:07 +01:00
Pyritie
dbed48eedf update CL 2025-08-21 12:13:49 +01:00
Pyritie
a2a30eb84b sterling silver alloy smelter 2025-08-21 12:06:38 +01:00
Pyritie
4cfe059c71 merge 2025-08-21 12:02:01 +01:00
Pyritie
08011735a1 whitespace? github tweakin again 2025-08-21 12:01:02 +01:00
TomPlop
4d801d9c96
Disable energy p2p (#1661)
* github being github

* First bandage fix for removing FE P2P
2025-08-21 09:42:07 +01:00
Redeix
6134da9caf
Update CHANGELOG.md
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-21 02:36:22 -05:00
Redeix
2f4b9fa954
Feature/quick fixes (#1664)
* Some reflector block fixes

* Trim tool changes

* Added rose gold alloy smelter recipes
2025-08-21 02:33:46 -05:00
Redeix
cd085be512
Updated tooltip file to use lang strings (#1663) 2025-08-21 00:27:42 -05:00
Pyritie
3f3e1133c2 false alarm 2025-08-21 00:12:09 +01:00
Pyritie
75d497ad5d with great power comes great responsibility 2025-08-20 23:37:31 +01:00
Vincent
59ad85e08f
FIx deathMessage typo and improve grammar (#1642)
* fix deathMessage typo

* Some more death message improvements

* add new death messages

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-19 17:56:02 -05:00
dependabot[bot]
3372a085e2
Bump devops-infra/action-pull-request in the dependencies group (#1653)
Bumps the dependencies group with 1 update: [devops-infra/action-pull-request](https://github.com/devops-infra/action-pull-request).


Updates `devops-infra/action-pull-request` from 0.6.0 to 0.6.1
- [Release notes](https://github.com/devops-infra/action-pull-request/releases)
- [Commits](https://github.com/devops-infra/action-pull-request/compare/v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: devops-infra/action-pull-request
  dependency-version: 0.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-19 11:49:41 +05:00
GameStar
3521adc4de
idk some recipes (#1635)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-15 22:20:48 -05:00