Skip to content

Commit

Permalink
Merge branch 'Botania' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Jun 14, 2022
2 parents b4faaac + 8dc9913 commit 7354d78
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
12 changes: 6 additions & 6 deletions config/GregTech/Unification.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13985,12 +13985,12 @@ specialunificationtargets {
}

botania {
B:ingotElvenElementium_false=false
B:ingotManasteel_false=false
B:ingotTerrasteel_false=false
B:nuggetElvenElementium_false=false
B:nuggetManasteel_false=false
B:nuggetTerrasteel_false=false
B:ingotElvenElementium_false=true
B:ingotManasteel_false=true
B:ingotTerrasteel_false=true
B:nuggetElvenElementium_false=true
B:nuggetManasteel_false=true
B:nuggetTerrasteel_false=true
}

}
Expand Down
3 changes: 3 additions & 0 deletions config/TGregworks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2482,6 +2482,7 @@ materials {
I:ElectricalSteel=1528
I:Electrum=1595
I:ElectrumFlux=1549
I:ElvenElementium=1742
I:Emerald=1596
I:EndSteel=1677
I:Enderium=1551
Expand Down Expand Up @@ -2536,6 +2537,7 @@ materials {
I:Ledox=1654
I:Magnalium=1602
I:Manganese=1508
I:Manasteel=1740
I:Marble=1675
I:MelodicAlloy=1680
I:MeteoricIron=1572
Expand Down Expand Up @@ -2600,6 +2602,7 @@ materials {
I:StyreneButadieneRubber=1664
I:Sunnarium=1588
I:Tanzanite=1613
I:Terrasteel=1741
I:Thorium=1519
I:TinAlloy=1614
I:Titanium=1520
Expand Down

0 comments on commit 7354d78

Please sign in to comment.