Browse Source

Fixed Energy Compat and Molecular Scanner

parent
commit
f2473e2ac0
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 0
CHANGELOG.md View File

@@ -10,6 +10,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
10 10
 
11 11
 
12 12
 6.14.24: (Not released yet, released whenever it needs to be)
13
+[FIXED] OpenComputers did not accept Electric GT6 Power even though it should, but ONLY if Galacticraft was installed. But now it works.
13 14
 [FIXED] Tools of other Mods being single use on NON-GT6 Stuff too, instead of only being single use on GT6 Stuff.
14 15
 [ADDED] Mass Storages and Item Barrels can now bundle and unbundle bare GT6 Wires. (Wires does NOT mean Cables!)
15 16
 

+ 27
- 27
src/main/java/gregapi/data/OP.java View File

@@ -128,9 +128,9 @@ public class OP {
128 128
 	dirtyGravel                 = create("dirtyGravel"                  , "Dirty Gravels"                   , ""                                , ""                                ).setMaterialStats(U    )     .setCondition(ORES)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, ORE_PROCESSING_BASED, ORE_PROCESSING_DIRTY  ).aspects(TC.FABRICO, 1), // Introduced by Factorization
129 129
 	
130 130
 	dust                        = create("dust"                         , "Dusts"                           , ""                                , " Dust"                           ).setMaterialStats(U    )     .setCondition(new Or(DUSTS, DIRTY_DUSTS))                                                                   .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.PERDITIO, 1).addIdenticalNames("pulp", "itemDust"), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka.
131
-	dustSmall                   = create("dustSmall"                    , "Small Dusts"                     , "Small Pile of "                  , " Dust"                           ).setMaterialStats(U4   )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 4), // 1/4th of a Dust.
132
-	dustTiny                    = create("dustTiny"                     , "Tiny Dusts"                      , "Tiny Pile of "                   , " Dust"                           ).setMaterialStats(U9   )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 9), // 1/9th of a Dust.
133
-	dustDiv72                   = create("dustDiv72"                    , "1/72nd Dusts"                    , "1/72nd of a Pile of "            , " Dust"                           ).setMaterialStats(U72  )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 8), // 1/72nd of a Dust.
131
+	dustSmall                   = create("dustSmall"                    , "Small Dusts"                     , "Small Pile of "                  , " Dust"                           ).setMaterialStats(U4   )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 4), // 1/4th of a Dust.
132
+	dustTiny                    = create("dustTiny"                     , "Tiny Dusts"                      , "Tiny Pile of "                   , " Dust"                           ).setMaterialStats(U9   )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 9), // 1/9th of a Dust.
133
+	dustDiv72                   = create("dustDiv72"                    , "1/72nd Dusts"                    , "1/72nd of a Pile of "            , " Dust"                           ).setMaterialStats(U72  )     .setCondition(dust)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, DUST_BASED           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 8), // 1/72nd of a Dust.
134 134
 	dustImpure                  = create("dustImpure"                   , "Impure Dusts"                    , "Impure Pile of "                 , " Dust"                           ).setMaterialStats(U9*10)     .setCondition(DIRTY_DUSTS)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, ORE_PROCESSING_BASED, ORE_PROCESSING_DIRTY                                        ).setMinStacksize( 1).setTextureSetName("dust").aspects(TC.TERRA, 1).addIdenticalNames("dustDirty"), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material
135 135
 	dustPure                    = create("dustPure"                     , "Purified Dusts"                  , "Purified Pile of "               , " Dust"                           ).setMaterialStats(U9*11)     .setCondition(DIRTY_DUSTS)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, ORE_PROCESSING_BASED, ORE_PROCESSING_CLEAN                                        ).setMinStacksize( 1).setTextureSetName("dust").aspects(TC.AQUA, 1),
136 136
 	dustRefined                 = create("dustRefined"                  , "Refined Dusts"                   , "Refined Pile of "                , " Dust"                           ).setMaterialStats(U9*12)     .setCondition(DIRTY_DUSTS)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, ORE_PROCESSING_BASED, ORE_PROCESSING_REFINED                                      ).setMinStacksize( 1).setTextureSetName("dust").aspects(TC.FABRICO, 1),
@@ -141,14 +141,14 @@ public class OP {
141 141
 	ingotDouble                 = create("ingotDouble"                  , "2x Ingots"                       , "Double "                         , " Ingot"                          ).setMaterialStats(U * 2)     .setCondition(MULTIINGOTS)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 5).aspects(TC.METALLUM, 1), // A double Ingot. Introduced by TerraFirmaCraft
142 142
 	ingotHot                    = create("ingotHot"                     , "Hot Ingots"                      , "Hot "                            , " Ingot"                          ).setMaterialStats(U    )     .setCondition(new And(INGOTS_HOT, SMITHABLE, OreDictMaterialCondition.meltmin(800)))                        .add(              BURNABLE, TOOLTIP_ENCHANTS, TOOLTIP_MATERIAL, TD.Creative.HIDDEN).setMinStacksize( 4).aspects(TC.METALLUM, 1, TC.IGNIS, 1), // A hot Ingot.
143 143
 	ingot                       = create("ingot"                        , "Ingots"                          , ""                                , " Ingot"                          ).setMaterialStats(U    )     .setCondition(INGOTS)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.METALLUM, 1), // A regular Ingot. Introduced by Eloraam
144
-	billet                      = create("billet"                       , "Billets"                         , ""                                , " Billet"                         ).setMaterialStats(U3* 2)     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 3).aspects(TC.METALLUM, 1), // A small Ingot. Introduced by HBM
145
-	chunkGt                     = create("chunkGt"                      , "Chunks"                          , ""                                , " Chunk"                          ).setMaterialStats(U4   )     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 4).aspects(TC.METALLUM, 1), // A large Nugget.
146
-	nugget                      = create("nugget"                       , "Nuggets"                         , ""                                , " Nugget"                         ).setMaterialStats(U9   )     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 9).aspects(TC.METALLUM, 1), // A Nugget. Introduced by Eloraam
144
+	billet                      = create("billet"                       , "Billets"                         , ""                                , " Billet"                         ).setMaterialStats(U3* 2)     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 3).aspects(TC.METALLUM, 1), // A small Ingot. Introduced by HBM
145
+	chunkGt                     = create("chunkGt"                      , "Chunks"                          , ""                                , " Chunk"                          ).setMaterialStats(U4   )     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 4).aspects(TC.METALLUM, 1), // A large Nugget.
146
+	nugget                      = create("nugget"                       , "Nuggets"                         , ""                                , " Nugget"                         ).setMaterialStats(U9   )     .setCondition(ingot)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, INGOT_BASED, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 9).aspects(TC.METALLUM, 1), // A Nugget. Introduced by Eloraam
147 147
 	
148 148
 	
149 149
 	gem                         = create("gem"                          , "Gemstones"                       , ""                                , ""                                ).setMaterialStats(U    )     .setCondition(GEMS)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.VITREUS, 1), // A regular Gem worth one Dust. Introduced by Eloraam
150
-	gemChipped                  = create("gemChipped"                   , "Chipped Gemstones"               , "Chipped "                        , ""                                ).setMaterialStats(U4   )     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 1), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
151
-	gemFlawed                   = create("gemFlawed"                    , "Flawed Gemstones"                , "Flawed "                         , ""                                ).setMaterialStats(U2   )     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 1), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
150
+	gemChipped                  = create("gemChipped"                   , "Chipped Gemstones"               , "Chipped "                        , ""                                ).setMaterialStats(U4   )     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 1), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
151
+	gemFlawed                   = create("gemFlawed"                    , "Flawed Gemstones"                , "Flawed "                         , ""                                ).setMaterialStats(U2   )     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 1), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
152 152
 	gemFlawless                 = create("gemFlawless"                  , "Flawless Gemstones"              , "Flawless "                       , ""                                ).setMaterialStats(U * 2)     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 2), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft
153 153
 	gemExquisite                = create("gemExquisite"                 , "Exquisite Gemstones"             , "Exquisite "                      , ""                                ).setMaterialStats(U * 4)     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 3), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft
154 154
 	gemLegendary                = create("gemLegendary"                 , "Legendary Gemstones"             , "Legendary "                      , ""                                ).setMaterialStats(U * 8)     .setCondition(new And(gem, TRANSPARENT, CRYSTAL, PEARL.NOT))                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 4), // A regular Gem worth nine Dusts. Introduced by GregTech
@@ -159,11 +159,11 @@ public class OP {
159 159
 	bouleGt                     = create("bouleGt"                      , "Boules"                          , ""                                , " Boule"                          ).setMaterialStats(U * 4)     .setCondition(ICondition.FALSE)                                                                             .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, SELF_REFERENCING, RECYCLABLE, SIMPLIFIABLE, GEM_BASED, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).aspects(TC.VITREUS, 1), // A boule which can be used to cut gem stuff out of.
160 160
 	crystalPure                 = create("crystalPure"                  , "Pure Crystals"                   , "Pure "                           , " Crystal"                        ).setMaterialStats(U2   )     .setCondition(GEMS)                                                                                         .add(              BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE).aspects(TC.VITREUS, 1),
161 161
 	crystal                     = create("crystal"                      , "Crystals"                        , ""                                , " Crystal"                        ).setMaterialStats(U    )     .setCondition(GEMS)                                                                                         .add(              BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE).aspects(TC.VITREUS, 1),
162
-	lens                        = create("lens"                         , "Lenses"                          , ""                                , " Lens"                           ).setMaterialStats(U4* 3)     .setCondition(LENSES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.VITREUS, 1, TC.FABRICO, 1), // 3/4 of a Plate or Gem used to shape a Lense. Normally only used on Transparent Materials.
162
+	lens                        = create("lens"                         , "Lenses"                          , ""                                , " Lens"                           ).setMaterialStats(U4* 3)     .setCondition(LENSES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, EXTRUDER_FODDER).aspects(TC.VITREUS, 1, TC.FABRICO, 1), // 3/4 of a Plate or Gem used to shape a Lense. Normally only used on Transparent Materials.
163 163
 	
164
-	scrapGt                     = create("scrapGt"                      , "Scrap"                           , ""                                , " Scrap"                          ).setMaterialStats(U9   )     .setCondition(new Or<>(dust, ingot, gem))                                                                   .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL, TD.Creative.HIDDEN).aspects(TC.PERDITIO, 1).setStacksize(18), // A piece of random Scrap. Basically just a container for 1/9th of a Material Unit of anything, which still has to be processed. Usually comes when breaking down Machines.
164
+	scrapGt                     = create("scrapGt"                      , "Scrap"                           , ""                                , " Scrap"                          ).setMaterialStats(U9   )     .setCondition(new Or<>(dust, ingot, gem))                                                                   .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL, TD.Creative.HIDDEN).aspects(TC.PERDITIO, 1).setStacksize(18), // A piece of random Scrap. Basically just a container for 1/9th of a Material Unit of anything, which still has to be processed. Usually comes when breaking down Machines.
165 165
 	
166
-	plateSteamcraft             = create("plateSteamcraft"              , "Thin Plates"                     , "Thin "                           , " Plate"                          ).setMaterialStats(U3* 2)     .setCondition(PLATES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1),
166
+	plateSteamcraft             = create("plateSteamcraft"              , "Thin Plates"                     , "Thin "                           , " Plate"                          ).setMaterialStats(U3* 2)     .setCondition(PLATES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1),
167 167
 	plateDense                  = create("plateDense"                   , "Dense Plates"                    , "Dense "                          , " Plate"                          ).setMaterialStats(U * 9)     .setCondition(DENSEPLATES)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 3), // 9 Plates compressed into one.
168 168
 	plateQuintuple              = create("plateQuintuple"               , "5x Plates"                       , "Quintuple "                      , " Plate"                          ).setMaterialStats(U * 5)     .setCondition(MULTIPLATES)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 2),
169 169
 	plateQuadruple              = create("plateQuadruple"               , "4x Plates"                       , "Quadruple "                      , " Plate"                          ).setMaterialStats(U * 4)     .setCondition(MULTIPLATES)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 2).addIdenticalNames("plateQuad"),
@@ -171,28 +171,28 @@ public class OP {
171 171
 	plateDouble                 = create("plateDouble"                  , "2x Plates"                       , "Double "                         , " Plate"                          ).setMaterialStats(U * 2)     .setCondition(MULTIPLATES)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1),
172 172
 	plate                       = create("plate"                        , "Plates"                          , ""                                , " Plate"                          ).setMaterialStats(U    )     .setCondition(new And(new Or(ingot, gem.NOT), PLATES))                                                      .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.FABRICO, 1), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
173 173
 	plateGem                    = create("plateGem"                     , "Gem Plates"                      , "Crystalline "                    , " Plate"                          ).setMaterialStats(U    )     .setCondition(new And(new Or(gem, bouleGt), PLATES))                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.FABRICO, 1), // Regular Plate made of one Gem/Dust.
174
-	plateTiny                   = create("plateTiny"                    , "Tiny Plates"                     , "Tiny "                           , " Plate"                          ).setMaterialStats(U9   )     .setCondition(plate)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Tiny Plate made of one ninth Ingot/Dust.
175
-	plateGemTiny                = create("plateGemTiny"                 , "Tiny Gem Plates"                 , "Tiny Crystalline "               , " Plate"                          ).setMaterialStats(U9   )     .setCondition(plateGem)                                                                                     .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Tiny Plate made of one ninth Gem/Dust.
174
+	plateTiny                   = create("plateTiny"                    , "Tiny Plates"                     , "Tiny "                           , " Plate"                          ).setMaterialStats(U9   )     .setCondition(plate)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Tiny Plate made of one ninth Ingot/Dust.
175
+	plateGemTiny                = create("plateGemTiny"                 , "Tiny Gem Plates"                 , "Tiny Crystalline "               , " Plate"                          ).setMaterialStats(U9   )     .setCondition(plateGem)                                                                                     .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Tiny Plate made of one ninth Gem/Dust.
176 176
 	plateCurved                 = create("plateCurved"                  , "Curved Plates"                   , "Curved "                         , " Plate"                          ).setMaterialStats(U    )     .setCondition(plate)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(64).aspects(TC.FABRICO, 1), // Curved regular Plate.
177 177
 	compressed                  = create("compressed"                   , "Compressed Materials"            , "Compressed "                     , ""                                ).setMaterialStats(U    )     .setCondition(PLATES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL, UNIFICATABLE_RECIPES).setMinStacksize(16).aspects(TC.FABRICO, 1).addIdenticalNames("Compressed"), // Compressed Material, worth 1 Unit. Introduced by Galacticraft
178 178
 	sheetGt                     = create("sheetGt"                      , "Flat Sheets"                     , ""                                , " Sheet"                          ).setMaterialStats(U    )     .setCondition(PLATES)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Flat Sheet, worth 1 Unit. Introduced by Advanced Rocketry, Prefix Name redirected by GT
179 179
 	
180
-	foil                        = create("foil"                         , "Foils"                           , ""                                , " Foil"                           ).setMaterialStats(U4   )     .setCondition(FOILS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Foil made of 1/4 Ingot/Dust.
181
-	stick                       = create("stick"                        , "Sticks/Rods"                     , ""                                , " Rod"                            ).setMaterialStats(U2   )     .setCondition(STICKS)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Stick made of half an Ingot. Introduced by Eloraam
180
+	foil                        = create("foil"                         , "Foils"                           , ""                                , " Foil"                           ).setMaterialStats(U4   )     .setCondition(FOILS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Foil made of 1/4 Ingot/Dust.
181
+	stick                       = create("stick"                        , "Sticks/Rods"                     , ""                                , " Rod"                            ).setMaterialStats(U2   )     .setCondition(STICKS)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Stick made of half an Ingot. Introduced by Eloraam
182 182
 	stickLong                   = create("stickLong"                    , "Long Sticks/Rods"                , "Long "                           , " Rod"                            ).setMaterialStats(U    )     .setCondition(stick)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // Stick made of an Ingot.
183
-	bolt                        = create("bolt"                         , "Bolts"                           , ""                                , " Bolt"                           ).setMaterialStats(U8   )     .setCondition(stick)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/8 Ingot or 1/4 Stick.
184
-	screw                       = create("screw"                        , "Screws"                          , ""                                , " Screw"                          ).setMaterialStats(U9   )     .setCondition(bolt)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of a Bolt.
185
-	round                       = create("round"                        , "Rounds"                          , ""                                , " Round"                          ).setMaterialStats(U9   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of one Nugget.
186
-	ring                        = create("ring"                         , "Rings"                           , ""                                , " Ring"                           ).setMaterialStats(U4   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/2 Stick.
183
+	bolt                        = create("bolt"                         , "Bolts"                           , ""                                , " Bolt"                           ).setMaterialStats(U8   )     .setCondition(stick)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/8 Ingot or 1/4 Stick.
184
+	screw                       = create("screw"                        , "Screws"                          , ""                                , " Screw"                          ).setMaterialStats(U9   )     .setCondition(bolt)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of a Bolt.
185
+	round                       = create("round"                        , "Rounds"                          , ""                                , " Round"                          ).setMaterialStats(U9   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of one Nugget.
186
+	ring                        = create("ring"                         , "Rings"                           , ""                                , " Ring"                           ).setMaterialStats(U4   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/2 Stick.
187 187
 	chain                       = create("chain"                        , "Chains"                          , ""                                , " Chain"                          ).setMaterialStats(U    )     .setCondition(ring)                                                                                         .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 4 Rings.
188 188
 	spring                      = create("spring"                       , "Springs"                         , ""                                , " Spring"                         ).setMaterialStats(U    )     .setCondition(new And<>(PARTS, new Or(STRETCHY, BOUNCY, BRITTLE.NOT)))                                      .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.MOTUS, 1), // consisting out of 2 Sticks.
189
-	springSmall                 = create("springSmall"                  , "Small Springs"                   , "Small "                          , " Spring"                         ).setMaterialStats(U4   )     .setCondition(spring)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.MOTUS, 1), // consisting out of 1 Fine Wire.
190
-	wireFine                    = create("wireFine"                     , "Fine Wires"                      , "Fine "                           , " Wire"                           ).setMaterialStats(U8   )     .setCondition(new Or<>(WIRES, new And<>(PARTS, SMITHABLE)))                                                 .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/8 Ingot or 1/4 Wire.
189
+	springSmall                 = create("springSmall"                  , "Small Springs"                   , "Small "                          , " Spring"                         ).setMaterialStats(U4   )     .setCondition(spring)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.MOTUS, 1), // consisting out of 1 Fine Wire.
190
+	wireFine                    = create("wireFine"                     , "Fine Wires"                      , "Fine "                           , " Wire"                           ).setMaterialStats(U8   )     .setCondition(new Or<>(WIRES, new And<>(PARTS, SMITHABLE)))                                                 .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of 1/8 Ingot or 1/4 Wire.
191 191
 	minecartWheels              = create("minecartWheels"               , "Cart Wheels"                     , ""                                , " Cart Wheels"                    ).setMaterialStats(U    )     .setCondition(new And<>(PARTS, SMITHABLE))                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1, TC.ITER, 1).setStacksize(16), // consisting out of 2 Rings and 1 Rod.
192 192
 	gearGt                      = create("gearGt"                       , "Gears"                           , ""                                , " Gear"                           ).setMaterialStats(U * 4)     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.MOTUS, 1, TC.MACHINA, 1), // Introduced by me because BuildCraft has ruined the gear Prefix...
193 193
 	gearGtSmall                 = create("gearGtSmall"                  , "Small Gears"                     , "Small "                          , " Gear"                           ).setMaterialStats(U    )     .setCondition(gearGt)                                                                                       .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.MOTUS, 1, TC.MACHINA, 1),
194
-	railGt                      = create("railGt"                       , "Single Rails"                    , ""                                , " Rail"                           ).setMaterialStats(U4   )     .setCondition(RAILS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.ITER, 1),
195
-	casingSmall                 = create("casingSmall"                  , "Item Casings"                    , ""                                , " Item Casing"                    ).setMaterialStats(U2   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of half a Metal Plate
194
+	railGt                      = create("railGt"                       , "Single Rails"                    , ""                                , " Rail"                           ).setMaterialStats(U4   )     .setCondition(RAILS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.ITER, 1),
195
+	casingSmall                 = create("casingSmall"                  , "Item Casings"                    , ""                                , " Item Casing"                    ).setMaterialStats(U2   )     .setCondition(PARTS)                                                                                        .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize(16).aspects(TC.FABRICO, 1), // consisting out of half a Metal Plate
196 196
 	casingMachine               = create("casingMachine"                , "Machine Casings"                 , ""                                , " Machine Casing"                 ).setMaterialStats(U * 8)     .setCondition(new And<>(PARTS, SMITHABLE))                                                                  .add(UNIFICATABLE, BURNABLE                  , RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 1).aspects(TC.FABRICO, 2, TC.MACHINA, 2).setStacksize(8),
197 197
 	casingMachineDouble         = create("casingMachineDouble"          , "Robust Machine Casings"          , "Robust "                         , " Machine Casing"                 ).setMaterialStats(U *14)     .setCondition(casingMachine)                                                                                .add(UNIFICATABLE, BURNABLE                  , RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 1).aspects(TC.FABRICO, 3, TC.MACHINA, 3).setStacksize(4),
198 198
 	casingMachineQuadruple      = create("casingMachineQuadruple"       , "Reinforced Machine Casings"      , "Reinforced "                     , " Machine Casing"                 ).setMaterialStats(U *26)     .setCondition(casingMachine)                                                                                .add(UNIFICATABLE, BURNABLE                  , RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, TOOLTIP_MATERIAL).setMinStacksize( 1).aspects(TC.FABRICO, 4, TC.MACHINA, 4).setStacksize(2),
@@ -241,7 +241,7 @@ public class OP {
241 241
 	toolHeadRawHoe              = create("toolHeadRawHoe"               , "Raw Hoe Heads"                   , "Raw "                            , " Hoe Head"                       ).setMaterialStats(U * 2)     .setCondition(toolHeadHoe)                                                                                  .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SCANNABLE, TOOL_HEAD, NEEDS_SHARPENING, NEEDS_HANDLE).setStacksize(16, 2).aspects(TC.INSTRUMENTUM, 2, TC.MESSIS, 1),
242 242
 	toolHeadRawSense            = create("toolHeadRawSense"             , "Raw Sense Blades"                , "Raw "                            , " Sense Blade"                    ).setMaterialStats(U * 3)     .setCondition(toolHeadSense)                                                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SCANNABLE, TOOL_HEAD, NEEDS_SHARPENING, NEEDS_HANDLE).setStacksize(16, 2).aspects(TC.INSTRUMENTUM, 2, TC.METO, 1),
243 243
 	toolHeadRawPlow             = create("toolHeadRawPlow"              , "Raw Plow Heads"                  , "Raw "                            , " Plow Head"                      ).setMaterialStats(U * 4)     .setCondition(toolHeadPlow)                                                                                 .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SCANNABLE, TOOL_HEAD, NEEDS_SHARPENING, NEEDS_HANDLE).setStacksize(16, 2).aspects(TC.INSTRUMENTUM, 2, TC.GELUM, 1),
244
-	toolHeadRawArrow            = create("toolHeadRawArrow"             , "Raw Arrow Heads"                 , "Raw "                            , " Arrow Head"                     ).setMaterialStats(U8   )     .setCondition(toolHeadArrow)                                                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE, SCANNABLE, TOOL_HEAD, NEEDS_SHARPENING              ).setStacksize(64, 2).aspects(TC.TELUM, 1),
244
+	toolHeadRawArrow            = create("toolHeadRawArrow"             , "Raw Arrow Heads"                 , "Raw "                            , " Arrow Head"                     ).setMaterialStats(U8   )     .setCondition(toolHeadArrow)                                                                                .add(UNIFICATABLE, BURNABLE, TOOLTIP_ENCHANTS, RECYCLABLE           , TOOL_HEAD, NEEDS_SHARPENING              ).setStacksize(64, 2).aspects(TC.TELUM, 1),
245 245
 	
246 246
 	toolSword                   = create("toolSword"                    , "Swords"                          , ""                                , ""                                ).setMaterialStats(U * 2)     .setCondition(typemin(1))                                                                                   .add(TOOL_ALIKE, BURNABLE, RECYCLABLE, WEAPON_ALIKE).setStacksize( 1).aspects(TC.INSTRUMENTUM, 1, TC.TELUM, 2), // vanilly Sword
247 247
 	toolPickaxe                 = create("toolPickaxe"                  , "Pickaxes"                        , ""                                , ""                                ).setMaterialStats(U * 3)     .setCondition(typemin(1))                                                                                   .add(TOOL_ALIKE, BURNABLE, RECYCLABLE              ).setStacksize( 1).aspects(TC.INSTRUMENTUM, 2, TC.PERFODIO, 1), // vanilly Pickaxe
@@ -266,9 +266,9 @@ public class OP {
266 266
 	
267 267
 	frameGt                     = create("frameGt"                      , "Frame Boxes"                     , ""                                , ""                                ).setMaterialStats(U * 2)     .setCondition(stick)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.FABRICO, 1),
268 268
 	
269
-	capcellcon                  = create("capcellcon"                   , "Capsule Cell Containers"         , ""                                , " Capsule Cell Container"         ).setMaterialStats(U9   )     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.VACUOS, 1),
269
+	capcellcon                  = create("capcellcon"                   , "Capsule Cell Containers"         , ""                                , " Capsule Cell Container"         ).setMaterialStats(U9   )     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER).aspects(TC.VACUOS, 1),
270 270
 	
271
-	pipeTiny                    = create("pipeTiny"                     , "Tiny Pipes"                      , "Tiny "                           , " Pipe"                           ).setMaterialStats(U2   )     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.ITER, 1),
271
+	pipeTiny                    = create("pipeTiny"                     , "Tiny Pipes"                      , "Tiny "                           , " Pipe"                           ).setMaterialStats(U2   )     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER).aspects(TC.ITER, 1),
272 272
 	pipeSmall                   = create("pipeSmall"                    , "Small Pipes"                     , "Small "                          , " Pipe"                           ).setMaterialStats(U    )     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.ITER, 1),
273 273
 	pipeMedium                  = create("pipeMedium"                   , "Medium Pipes"                    , "Medium "                         , " Pipe"                           ).setMaterialStats(U * 3)     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.ITER, 1),
274 274
 	pipeLarge                   = create("pipeLarge"                    , "Large pipes"                     , "Large "                          , " Pipe"                           ).setMaterialStats(U * 6)     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER).aspects(TC.ITER, 1),
@@ -282,7 +282,7 @@ public class OP {
282 282
 	pipeRestrictiveHuge         = create("pipeRestrictiveHuge"          , "Huge Restrictive Pipes"          , "Huge Restrictive "               , " Pipe"                           ).setMaterialStats(U *12)     .setCondition(PIPES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE).aspects(TC.ITER, 2),
283 283
 	pipe                        = create("pipe"                         , "Pipes"                           , ""                                , " Pipe"                           )                             .setCondition(PIPES)                                                                                        .add().aspects(TC.ITER, 1),
284 284
 	
285
-	wireGt16                    = create("wireGt16"                     , "16x Wires"                       , "16x "                            , " Wire"                           ).setMaterialStats(U2*16)     .setCondition(WIRES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, WIRE_BASED).setMinStacksize( 2).aspects(TC.ELECTRUM, 1),
285
+	wireGt16                    = create("wireGt16"                     , "16x Wires"                       , "16x "                            , " Wire"                           ).setMaterialStats(U2*16)     .setCondition(WIRES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE           , EXTRUDER_FODDER, WIRE_BASED).setMinStacksize( 2).aspects(TC.ELECTRUM, 1),
286 286
 	wireGt15                    = create("wireGt15"                     , "15x Wires"                       , "15x "                            , " Wire"                           ).setMaterialStats(U2*15)     .setCondition(WIRES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, WIRE_BASED).setMinStacksize( 2).aspects(TC.ELECTRUM, 1),
287 287
 	wireGt14                    = create("wireGt14"                     , "14x Wires"                       , "14x "                            , " Wire"                           ).setMaterialStats(U2*14)     .setCondition(WIRES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, WIRE_BASED).setMinStacksize( 2).aspects(TC.ELECTRUM, 1),
288 288
 	wireGt13                    = create("wireGt13"                     , "13x Wires"                       , "13x "                            , " Wire"                           ).setMaterialStats(U2*13)     .setCondition(WIRES)                                                                                        .add(UNIFICATABLE, BURNABLE, UNIFICATABLE_RECIPES, RECYCLABLE, SIMPLIFIABLE, SCANNABLE, EXTRUDER_FODDER, WIRE_BASED).setMinStacksize( 2).aspects(TC.ELECTRUM, 1),

+ 2
- 2
src/main/java/gregapi/recipes/maps/RecipeMapScannerMolecular.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -54,7 +54,7 @@ public class RecipeMapScannerMolecular extends RecipeMap {
54 54
 				assert tScanned != null; // just to make eclipse shut the fuck up
55 55
 				OreDictItemData aData = OM.anydata_(tScanned);
56 56
 				if (aData.mPrefix != null && aData.mMaterial != null && aData.mMaterial.mMaterial.mID > 0 && aData.mPrefix.contains(TD.Prefix.SCANNABLE)) {
57
-					rRecipe = new Recipe(F, F, F, ST.array(ST.amount(Math.max(1, U / aData.mMaterial.mAmount), tScanned), ST.amount(1, tUSB)), ST.array(ST.amount(1, tUSB)), null, null, null, null, (aData.mMaterial.mMaterial.mProtons+aData.mMaterial.mMaterial.mNeutrons) * 512, 512, 0);
57
+					rRecipe = new Recipe(F, F, F, ST.array(ST.amount(1, tScanned), ST.amount(1, tUSB)), ST.array(ST.amount(1, tUSB)), null, null, null, null, (aData.mMaterial.mMaterial.mProtons+aData.mMaterial.mMaterial.mNeutrons) * 512, 512, 0);
58 58
 					if (!rRecipe.mOutputs[0].hasTagCompound()) rRecipe.mOutputs[0].setTagCompound(UT.NBT.make());
59 59
 					rRecipe.mOutputs[0].getTagCompound().setTag(NBT_USB_DATA, UT.NBT.makeShort(NBT_REPLICATOR_DATA, aData.mMaterial.mMaterial.mID));
60 60
 					rRecipe.mOutputs[0].getTagCompound().setByte(NBT_USB_TIER, (byte)3);

+ 1
- 1
src/main/java/gregapi/tileentity/energy/EnergyCompat.java View File

@@ -156,7 +156,7 @@ public class EnergyCompat {
156 156
 			
157 157
 			// GalactiCraft and its Addons
158 158
 			if (GC_ENERGY && COMPAT_GC != null) {
159
-				if (aReceiver instanceof micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC) {
159
+				if (aReceiver instanceof micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC && !(RF_ENERGY && isElectricRFReceiver(aReceiver))) {
160 160
 					if (!(aReceiver instanceof micdoodle8.mods.galacticraft.api.transmission.tile.IConnector) || ((micdoodle8.mods.galacticraft.api.transmission.tile.IConnector)aReceiver).canConnect(FORGE_DIR[aSide], micdoodle8.mods.galacticraft.api.transmission.NetworkType.POWER)) {
161 161
 						if (checkOverCharge(aSize, aReceiver)) return aAmount;
162 162
 						float tSizeToReceive = aSize * micdoodle8.mods.galacticraft.core.energy.EnergyConfigHandler.IC2_RATIO, tStored = ((micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC)aReceiver).getEnergyStoredGC((micdoodle8.mods.galacticraft.api.power.EnergySource)COMPAT_GC.dir(aSide));

BIN
src/main/resources/assets/gregtech/textures/gui/machines/ScannerMolecular.png View File


Loading…
Cancel
Save