Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.8ification #719

Merged
merged 33 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
183fa4c
init commit
planetme Jan 9, 2024
d0c34be
update mixinbooter & grs
planetme Jan 9, 2024
179e4e4
new GrS/GT configs, update GTFO
planetme Jan 9, 2024
b0edd02
remove craft tweaker
planetme Jan 9, 2024
29f3e66
Revert "remove craft tweaker"
planetme Jan 9, 2024
fe1cf56
refactor HP material registration
planetme Jan 9, 2024
24f9de7
la corrección de FirstDegree & SecondDegreeMaterials.groovy
planetme Jan 10, 2024
49dcca0
fluid refactor for ThirdDegreeMaterials.groovy
planetme Jan 10, 2024
dd65e1f
move working fluid steam turbine recipes to large turbine exclusively
TechLord22 Jan 10, 2024
5307c08
fluid refactor for organic, petrochem, thermo, and unknown materials
planetme Jan 11, 2024
aaeaa7a
fix changeflags
planetme Jan 11, 2024
9333465
some fixes
planetme Jan 12, 2024
7a67736
guhhh
planetme Jan 12, 2024
3f4d151
guh part 2
planetme Jan 12, 2024
974d1ef
remove guhhhhh
bruberu Jan 12, 2024
cea77fd
Merge branch 'HEAD' into origin/2.8
bruberu Jan 12, 2024
659c65f
Fix all the groovyscript errors!
bruberu Jan 21, 2024
6fe57c1
Remove some of the warnings
bruberu Jan 21, 2024
00cb844
fix CBr4
planetme Jan 22, 2024
fb85d33
update to 2.8.6
planetme Jan 22, 2024
fe462be
fix polyolefin merge conflicts
planetme Jan 22, 2024
6f0b68d
fix everything
planetme Jan 22, 2024
3a0c35d
Merge branch 'tc-separate-steam-turbines' into 2.8
planetme Jan 22, 2024
05d7132
fix xtones
planetme Jan 22, 2024
fdd6f5a
regate LV hatches & remove 2.8 steel recipes
planetme Jan 22, 2024
608b720
custom tape recipes
planetme Jan 22, 2024
bb91c2c
cabal infinite water hatches
planetme Jan 22, 2024
5ba2c15
remove gt bed recipes (affront to mankind)
planetme Jan 22, 2024
9787ef7
add new minecart wheels to black mesa trains
planetme Jan 22, 2024
6c2bdb5
merge main
planetme Jan 22, 2024
253da47
add quenching for RTM
planetme Jan 22, 2024
220ff2f
Unshift IDs
bruberu Jan 22, 2024
b40e0ab
Revert "Unshift IDs"
planetme Jan 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/UniversalTweaks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ general {
B:"Remove Realms Button"=true

# Removes the recipe book button from GUIs
B:"Remove Recipe Book"=false
B:"Remove Recipe Book"=true

# Forcefully turns off the snooper and hides the snooper settings button from the options menu
B:"Remove Snooper"=true
Expand Down
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests.json
Original file line number Diff line number Diff line change
Expand Up @@ -9069,7 +9069,7 @@
"id:8": "forge:bucketfilled",
"tag:10": {
"Amount:3": 1000,
"FluidName:8": "tnt_solution"
"FluidName:8": "tnt_slurry"
}
},
"ignoresview:1": 0,
Expand Down
33 changes: 33 additions & 0 deletions config/gregtech/forestry_integration.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Configuration file

forestry {
# Whether to disable some bees from other Forestry addons, such as ExtraBees and MagicBees, in favor of GTs.
# Heavily recommended, as the removed bees have no purpose with GT Bees other than JEI and breed tree clutter.
# Default: true
B:disableConflictingBees=true

# Enable GregTech Bees.
# Requirements: Forestry Apiculture module
# Recommended: ExtraBees and MagicBees, as some GT bees are only added, and others have more interesting mutations, if those mods are present
# Default: true
B:enableGTBees=true

# Enable GregTech Electron Tubes.
# Default: true
B:enableGTElectronTubes=true

# Enable GregTech Apiary Frames.
# Requirements: Forestry Apiculture module
# Default: true
B:enableGTFrames=true

# Enable the GregTech Scoop.
# Default: true
B:enableGTScoop=true

# Whether to remove some Forestry Crafting Table recipes (such as Fertilizer, Compost, etc) in favor of GT recipes.
# Default: false
B:harderForestryRecipes=false
}


Loading