Browse Source

Compatibility with Fossils and Archeology

parent
commit
ff1d960862
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 103
- 0
.defaultconfigs/config/BetterFoliage.cfg View File

@@ -0,0 +1,103 @@
1
+# Configuration file
2
+
3
+blocks {
4
+    S:dirtWhitelist <
5
+        net.minecraft.block.BlockDirt
6
+        biomesoplenty.common.blocks.BlockNewDirt
7
+        enhancedbiomes.blocks.BlockSoilEB
8
+        com.bioxx.tfc.Blocks.Terrain.BlockDirt
9
+        net.aetherteam.aether.blocks.natural.BlockAetherDirt
10
+     >
11
+    S:dirtBlacklist <
12
+     >
13
+    S:grassWhitelist <
14
+        net.minecraft.block.BlockGrass
15
+        biomesoplenty.common.blocks.BlockOriginGrass
16
+        biomesoplenty.common.blocks.BlockLongGrass
17
+        biomesoplenty.common.blocks.BlockNewGrass
18
+        tconstruct.blocks.slime.SlimeGrass
19
+        enhancedbiomes.blocks.BlockGrassEB
20
+        com.bioxx.tfc.Blocks.Terrain.BlockGrass
21
+        net.aetherteam.aether.blocks.natural.BlockAetherGrass
22
+     >
23
+    S:grassBlacklist <
24
+     >
25
+    S:leavesWhitelist <
26
+        net.minecraft.block.BlockLeavesBase
27
+        forestry.arboriculture.gadgets.BlockLeaves
28
+        thaumcraft.common.blocks.BlockMagicalLeaves
29
+        gregtech.blocks.tree.BlockTreeLeaves
30
+     >
31
+    S:leavesBlacklist <
32
+     >
33
+    S:cropsWhitelist <
34
+        net.minecraft.block.BlockTallGrass
35
+        net.minecraft.block.BlockCrops
36
+        net.minecraft.block.BlockReed
37
+        net.minecraft.block.BlockDoublePlant
38
+        biomesoplenty.common.blocks.BlockBOPFlower
39
+        biomesoplenty.common.blocks.BlockBOPFlower2
40
+        tconstruct.blocks.slime.SlimeTallGrass
41
+        plantmegapack.block.PMPBlockBerrybush
42
+        plantmegapack.block.PMPBlockCrops
43
+        plantmegapack.block.PMPBlockDesert
44
+        plantmegapack.block.PMPBlockFern
45
+        plantmegapack.block.PMPBlockFlowerMulti
46
+        plantmegapack.block.PMPBlockFlowerSingle
47
+        plantmegapack.block.PMPBlockForest
48
+        plantmegapack.block.PMPBlockGrass
49
+        plantmegapack.block.PMPBlockJungle
50
+        plantmegapack.block.PMPBlockMountain
51
+        plantmegapack.block.PMPBlockSavanna
52
+        plantmegapack.block.PMPBlockShrub
53
+        plantmegapack.block.PMPBlockWetlands
54
+        com.pam.harvestcraft.BlockPamCrop
55
+        com.pam.harvestcraft.BlockPamDesertGarden
56
+        com.pam.harvestcraft.BlockPamNormalGarden
57
+        com.pam.harvestcraft.BlockPamWaterGarden
58
+     >
59
+    S:cropsBlacklist <
60
+        net.minecraft.block.BlockCarrot
61
+        net.minecraft.block.BlockPotato
62
+     >
63
+    S:logsWhitelist <
64
+        net.minecraft.block.BlockLog
65
+        biomesoplenty.common.blocks.BlockBOPLog
66
+        mods.natura.blocks.trees.DarkTreeBlock
67
+        mods.natura.blocks.trees.LogTwoxTwo
68
+        mods.natura.blocks.trees.SimpleLog
69
+        thaumcraft.common.blocks.BlockMagicalLog
70
+        forestry.arboriculture.gadgets.BlockLog
71
+        com.bioxx.tfc.Blocks.Flora.BlockLogVert
72
+        com.bioxx.tfc.Blocks.Flora.BlockLogNatural
73
+        ic2.core.block.BlockRubWood
74
+        gregtech.blocks.tree.BlockTreeLog1
75
+        gregtech.blocks.tree.BlockTreeLog1FireProof
76
+        gregtech.blocks.tree.BlockTreeLogA
77
+        gregtech.blocks.tree.BlockTreeLogAFireProof
78
+        gregtech.blocks.tree.BlockTreeLogB
79
+        gregtech.blocks.tree.BlockTreeLogBFireProof
80
+
81
+     >
82
+    S:logsBlacklist <
83
+        extrabiomes.blocks.BlockMiniLog
84
+     >
85
+    S:sandWhitelist <
86
+        net.minecraft.block.BlockSand
87
+        com.bioxx.tfc.Blocks.Terrain.BlockSand
88
+     >
89
+    S:sandBlacklist <
90
+     >
91
+    S:lilypadWhitelist <
92
+        net.minecraft.block.BlockLilyPad
93
+        com.bioxx.tfc.Blocks.Vanilla.BlockCustomLilyPad
94
+     >
95
+    S:lilypadBlacklist <
96
+     >
97
+    S:cactusWhitelist <
98
+        net.minecraft.block.BlockCactus
99
+        com.bioxx.tfc.Blocks.Vanilla.BlockCustomCactus
100
+     >
101
+    S:cactusBlacklist <
102
+     >
103
+}

+ 1
- 1
CHANGELOG.md View File

@@ -26,7 +26,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
26 26
 
27 27
 
28 28
 6.09.14: (Not released yet)
29
-Nothing (I tend to only add finished Stuff to the Changelog).
29
+[COMPAT] Fossils and Archeology got a few things made more compatible. It's surprisingly compatible with the OreDict though, so I didnt have to do much with the Item Data or its Music Discs.
30 30
 
31 31
 
32 32
 6.09.13:

+ 1
- 1
src/main/java/gregapi/GT_API.java View File

@@ -159,7 +159,7 @@ import net.minecraftforge.oredict.RecipeSorter;
159 159
  * 
160 160
  * This loads before the compatible Mods, except Micdoodlecore. GT_API_Post loads after all compatible Mods.
161 161
  */
162
-@Mod(modid=ModIDs.GAPI, name="Greg-API", version="GT6-MC1710", dependencies="required-before:"+ModIDs.GAPI_POST+"; after:"+ModIDs.MD8+"; before:"+ModIDs.IC2+"; before:"+ModIDs.IC2C+"; before:"+ModIDs.NC+"; before:"+ModIDs.IHL+"; before:"+ModIDs.FMB+"; before:"+ModIDs.BAUBLES+"; before:"+ModIDs.GaSu+"; before:"+ModIDs.GaNe+"; before:"+ModIDs.GaEn+"; before:"+ModIDs.WdSt+"; before:"+ModIDs.CrGu+"; before:"+ModIDs.COFH_API+"; before:"+ModIDs.COFH_API_ENERGY+"; before:"+ModIDs.CC+"; before:"+ModIDs.OC+"; before:"+ModIDs.DE+"; before:"+ModIDs.FR+"; before:"+ModIDs.FRMB+"; before:"+ModIDs.BINNIE+"; before:"+ModIDs.BINNIE_BEE+"; before:"+ModIDs.BINNIE_TREE+"; before:"+ModIDs.BINNIE_GENETICS+"; before:"+ModIDs.BINNIE_BOTANY+"; before:"+ModIDs.IE+"; before:"+ModIDs.UB+"; before:"+ModIDs.COG+"; before:"+ModIDs.PFAA+"; before:"+ModIDs.ARS+"; before:"+ModIDs.TC+"; before:"+ModIDs.TCFM+"; before:"+ModIDs.BOTA+"; before:"+ModIDs.ALF+"; before:"+ModIDs.WTCH+"; before:"+ModIDs.HOWL+"; before:"+ModIDs.MoCr+"; before:"+ModIDs.GoG+"; before:"+ModIDs.LycM+"; before:"+ModIDs.LycM_Arctic+"; before:"+ModIDs.LycM_Demon+"; before:"+ModIDs.LycM_Desert+"; before:"+ModIDs.LycM_Forest+"; before:"+ModIDs.LycM_Fresh+"; before:"+ModIDs.LycM_Inferno+"; before:"+ModIDs.LycM_Jungle+"; before:"+ModIDs.LycM_Mountain+"; before:"+ModIDs.LycM_Plains+"; before:"+ModIDs.LycM_Salt+"; before:"+ModIDs.LycM_Shadow+"; before:"+ModIDs.LycM_Swamp+"; before:"+ModIDs.RC+"; before:"+ModIDs.BP+"; before:"+ModIDs.PR+"; before:"+ModIDs.PR_EXPANSION+"; before:"+ModIDs.PR_INTEGRATION+"; before:"+ModIDs.PR_TRANSMISSION+"; before:"+ModIDs.PR_TRANSPORT+"; before:"+ModIDs.PR_EXPLORATION+"; before:"+ModIDs.PR_COMPATIBILITY+"; before:"+ModIDs.PR_FABRICATION+"; before:"+ModIDs.PR_ILLUMINATION+"; before:"+ModIDs.PE+"; before:"+ModIDs.AE+"; before:"+ModIDs.MO+"; before:"+ModIDs.TE_FOUNDATION+"; before:"+ModIDs.TE_DYNAMICS+"; before:"+ModIDs.TE+"; before:"+ModIDs.ZTONES+"; before:"+ModIDs.CHSL+"; before:"+ModIDs.EtFu+"; before:"+ModIDs.BB+"; before:"+ModIDs.DYNAMIC_TREES+"; before:"+ModIDs.BbLC+"; before:"+ModIDs.CARP+"; before:"+ModIDs.BETTER_RECORDS+"; before:"+ModIDs.TF+"; before:"+ModIDs.ERE+"; before:"+ModIDs.MFR+"; before:"+ModIDs.PnC+"; before:"+ModIDs.ExU+"; before:"+ModIDs.ExS+"; before:"+ModIDs.EIO+"; before:"+ModIDs.RT+"; before:"+ModIDs.AA+"; before:"+ModIDs.HaC+"; before:"+ModIDs.CookBook+"; before:"+ModIDs.APC+"; before:"+ModIDs.ENVM+"; before:"+ModIDs.MaCr+"; before:"+ModIDs.BC_TRANSPORT+"; before:"+ModIDs.BC_SILICON+"; before:"+ModIDs.BC_FACTORY+"; before:"+ModIDs.BC_ENERGY+"; before:"+ModIDs.BC_ROBOTICS+"; before:"+ModIDs.BC+"; before:"+ModIDs.BC_BUILDERS+"; before:"+ModIDs.MgC+"; before:"+ModIDs.BR+"; before:"+ModIDs.HBM+"; before:"+ModIDs.DRGN+"; before:"+ModIDs.ElC+"; before:"+ModIDs.CrC+"; before:"+ModIDs.ReC+"; before:"+ModIDs.RoC+"; before:"+ModIDs.Mek+"; before:"+ModIDs.Mek_Tools+"; before:"+ModIDs.Mek_Generators+"; before:"+ModIDs.GC+"; before:"+ModIDs.GC_PLANETS+"; before:"+ModIDs.GC_GALAXYSPACE+"; before:"+ModIDs.VULPES+"; before:"+ModIDs.GC_ADV_ROCKETRY+"; before:"+ModIDs.BTL+"; before:"+ModIDs.AETHER+"; before:"+ModIDs.TROPIC+"; before:"+ModIDs.ATUM+"; before:"+ModIDs.EB+"; before:"+ModIDs.EBXL+"; before:"+ModIDs.BoP+"; before:"+ModIDs.HiL+"; before:"+ModIDs.ATG+"; before:"+ModIDs.RTG+"; before:"+ModIDs.RWG+"; before:"+ModIDs.MYST+"; before:"+ModIDs.WARPBOOK+"; before:"+ModIDs.LOSTBOOKS+"; before:"+ModIDs.EUREKA+"; before:"+ModIDs.ENCHIRIDION+"; before:"+ModIDs.ENCHIRIDION2+"; before:"+ModIDs.SmAc+"; before:"+ModIDs.HQM+"; before:"+ModIDs.JABBA+"; before:"+ModIDs.MaCu+"; before:"+ModIDs.PdC+"; before:"+ModIDs.Bamboo+"; before:"+ModIDs.GrC+"; before:"+ModIDs.GrC_Apples+"; before:"+ModIDs.GrC_Bamboo+"; before:"+ModIDs.GrC_Bees+"; before:"+ModIDs.GrC_Cellar+"; before:"+ModIDs.GrC_Fish+"; before:"+ModIDs.GrC_Grapes+"; before:"+ModIDs.GrC_Hops+"; before:"+ModIDs.GrC_Milk+"; before:"+ModIDs.GrC_Rice+"; before:"+ModIDs.BWM+"; before:"+ModIDs.OMT+"; before:"+ModIDs.TG+"; before:"+ModIDs.FM+"; before:"+ModIDs.FZ+"; before:"+ModIDs.MNTL+"; before:"+ModIDs.OB+"; before:"+ModIDs.TiC+"; before:"+ModIDs.WR_CBE_C+"; before:"+ModIDs.WR_CBE_A+"; before:"+ModIDs.WR_CBE_L+"; before:"+ModIDs.VOLTZ+"; before:"+ModIDs.MFFS+"; before:"+ModIDs.ICBM+"; before:"+ModIDs.ATSCI+"; before:inventorytweaks; before:ironbackpacks; before:journeymap; before:LogisticsPipes; before:LunatriusCore; before:NEIAddons; before:NEIAddons|Developer; before:NEIAddons|AppEng; before:NEIAddons|Botany; before:NEIAddons|Forestry; before:NEIAddons|CraftingTables; before:NEIAddons|ExNihilo; before:neiintegration; before:openglasses; before:simplyjetpacks; before:Stackie; before:StevesCarts; before:TiCTooltips; before:worldedit; before:McMultipart; before:OpenPeripheralCore; before:OpenPeripheralIntegration; before:OpenPeripheral; ")
162
+@Mod(modid=ModIDs.GAPI, name="Greg-API", version="GT6-MC1710", dependencies="required-before:"+ModIDs.GAPI_POST+"; after:"+ModIDs.MD8+"; before:"+ModIDs.IC2+"; before:"+ModIDs.IC2C+"; before:"+ModIDs.NC+"; before:"+ModIDs.IHL+"; before:"+ModIDs.FMB+"; before:"+ModIDs.BAUBLES+"; before:"+ModIDs.GaSu+"; before:"+ModIDs.GaNe+"; before:"+ModIDs.GaEn+"; before:"+ModIDs.WdSt+"; before:"+ModIDs.CrGu+"; before:"+ModIDs.COFH_API+"; before:"+ModIDs.COFH_API_ENERGY+"; before:"+ModIDs.CC+"; before:"+ModIDs.OC+"; before:"+ModIDs.DE+"; before:"+ModIDs.FR+"; before:"+ModIDs.FRMB+"; before:"+ModIDs.BINNIE+"; before:"+ModIDs.BINNIE_BEE+"; before:"+ModIDs.BINNIE_TREE+"; before:"+ModIDs.BINNIE_GENETICS+"; before:"+ModIDs.BINNIE_BOTANY+"; before:"+ModIDs.IE+"; before:"+ModIDs.UB+"; before:"+ModIDs.COG+"; before:"+ModIDs.PFAA+"; before:"+ModIDs.ARS+"; before:"+ModIDs.TC+"; before:"+ModIDs.TCFM+"; before:"+ModIDs.BOTA+"; before:"+ModIDs.ALF+"; before:"+ModIDs.WTCH+"; before:"+ModIDs.HOWL+"; before:"+ModIDs.MoCr+"; before:"+ModIDs.GoG+"; before:"+ModIDs.LycM+"; before:"+ModIDs.LycM_Arctic+"; before:"+ModIDs.LycM_Demon+"; before:"+ModIDs.LycM_Desert+"; before:"+ModIDs.LycM_Forest+"; before:"+ModIDs.LycM_Fresh+"; before:"+ModIDs.LycM_Inferno+"; before:"+ModIDs.LycM_Jungle+"; before:"+ModIDs.LycM_Mountain+"; before:"+ModIDs.LycM_Plains+"; before:"+ModIDs.LycM_Salt+"; before:"+ModIDs.LycM_Shadow+"; before:"+ModIDs.LycM_Swamp+"; before:"+ModIDs.RC+"; before:"+ModIDs.BP+"; before:"+ModIDs.PR+"; before:"+ModIDs.PR_EXPANSION+"; before:"+ModIDs.PR_INTEGRATION+"; before:"+ModIDs.PR_TRANSMISSION+"; before:"+ModIDs.PR_TRANSPORT+"; before:"+ModIDs.PR_EXPLORATION+"; before:"+ModIDs.PR_COMPATIBILITY+"; before:"+ModIDs.PR_FABRICATION+"; before:"+ModIDs.PR_ILLUMINATION+"; before:"+ModIDs.PE+"; before:"+ModIDs.AE+"; before:"+ModIDs.MO+"; before:"+ModIDs.TE_FOUNDATION+"; before:"+ModIDs.TE_DYNAMICS+"; before:"+ModIDs.TE+"; before:"+ModIDs.ZTONES+"; before:"+ModIDs.CHSL+"; before:"+ModIDs.EtFu+"; before:"+ModIDs.BB+"; before:"+ModIDs.DYNAMIC_TREES+"; before:"+ModIDs.BbLC+"; before:"+ModIDs.CARP+"; before:"+ModIDs.BETTER_RECORDS+"; before:"+ModIDs.TF+"; before:"+ModIDs.ERE+"; before:"+ModIDs.MFR+"; before:"+ModIDs.PnC+"; before:"+ModIDs.ExU+"; before:"+ModIDs.ExS+"; before:"+ModIDs.EIO+"; before:"+ModIDs.RT+"; before:"+ModIDs.AA+"; before:"+ModIDs.HaC+"; before:"+ModIDs.CookBook+"; before:"+ModIDs.APC+"; before:"+ModIDs.ENVM+"; before:"+ModIDs.MaCr+"; before:"+ModIDs.BC_TRANSPORT+"; before:"+ModIDs.BC_SILICON+"; before:"+ModIDs.BC_FACTORY+"; before:"+ModIDs.BC_ENERGY+"; before:"+ModIDs.BC_ROBOTICS+"; before:"+ModIDs.BC+"; before:"+ModIDs.BC_BUILDERS+"; before:"+ModIDs.MgC+"; before:"+ModIDs.BR+"; before:"+ModIDs.HBM+"; before:"+ModIDs.DRGN+"; before:"+ModIDs.ElC+"; before:"+ModIDs.CrC+"; before:"+ModIDs.ReC+"; before:"+ModIDs.RoC+"; before:"+ModIDs.Mek+"; before:"+ModIDs.Mek_Tools+"; before:"+ModIDs.Mek_Generators+"; before:"+ModIDs.GC+"; before:"+ModIDs.GC_PLANETS+"; before:"+ModIDs.GC_GALAXYSPACE+"; before:"+ModIDs.VULPES+"; before:"+ModIDs.GC_ADV_ROCKETRY+"; before:"+ModIDs.BTL+"; before:"+ModIDs.AETHER+"; before:"+ModIDs.TROPIC+"; before:"+ModIDs.ATUM+"; before:"+ModIDs.EB+"; before:"+ModIDs.EBXL+"; before:"+ModIDs.BoP+"; before:"+ModIDs.HiL+"; before:"+ModIDs.ATG+"; before:"+ModIDs.RTG+"; before:"+ModIDs.RWG+"; before:"+ModIDs.MYST+"; before:"+ModIDs.WARPBOOK+"; before:"+ModIDs.LOSTBOOKS+"; before:"+ModIDs.EUREKA+"; before:"+ModIDs.ENCHIRIDION+"; before:"+ModIDs.ENCHIRIDION2+"; before:"+ModIDs.SmAc+"; before:"+ModIDs.HQM+"; before:"+ModIDs.JABBA+"; before:"+ModIDs.MaCu+"; before:"+ModIDs.PdC+"; before:"+ModIDs.Bamboo+"; before:"+ModIDs.Fossil+"; before:"+ModIDs.GrC+"; before:"+ModIDs.GrC_Apples+"; before:"+ModIDs.GrC_Bamboo+"; before:"+ModIDs.GrC_Bees+"; before:"+ModIDs.GrC_Cellar+"; before:"+ModIDs.GrC_Fish+"; before:"+ModIDs.GrC_Grapes+"; before:"+ModIDs.GrC_Hops+"; before:"+ModIDs.GrC_Milk+"; before:"+ModIDs.GrC_Rice+"; before:"+ModIDs.BWM+"; before:"+ModIDs.OMT+"; before:"+ModIDs.TG+"; before:"+ModIDs.FM+"; before:"+ModIDs.FZ+"; before:"+ModIDs.MNTL+"; before:"+ModIDs.OB+"; before:"+ModIDs.TiC+"; before:"+ModIDs.WR_CBE_C+"; before:"+ModIDs.WR_CBE_A+"; before:"+ModIDs.WR_CBE_L+"; before:"+ModIDs.VOLTZ+"; before:"+ModIDs.MFFS+"; before:"+ModIDs.ICBM+"; before:"+ModIDs.ATSCI+"; before:inventorytweaks; before:ironbackpacks; before:journeymap; before:LogisticsPipes; before:LunatriusCore; before:NEIAddons; before:NEIAddons|Developer; before:NEIAddons|AppEng; before:NEIAddons|Botany; before:NEIAddons|Forestry; before:NEIAddons|CraftingTables; before:NEIAddons|ExNihilo; before:neiintegration; before:openglasses; before:simplyjetpacks; before:Stackie; before:StevesCarts; before:TiCTooltips; before:worldedit; before:McMultipart; before:OpenPeripheralCore; before:OpenPeripheralIntegration; before:OpenPeripheral; ")
163 163
 public class GT_API extends Abstract_Mod {
164 164
 	@SidedProxy(modId = ModIDs.GAPI, clientSide = "gregapi.GT_API_Proxy_Client", serverSide = "gregapi.GT_API_Proxy_Server")
165 165
 	public static GT_API_Proxy api_proxy;

+ 1
- 1
src/main/java/gregapi/GT_API_Post.java View File

@@ -66,7 +66,7 @@ import net.minecraft.item.Item;
66 66
  * 
67 67
  * This loads after the compatible Mods. The regular API loads before all compatible Mods.
68 68
  */
69
-@Mod(modid=ModIDs.GAPI_POST, name="Greg-API-Post", version="GT6-MC1710", dependencies="required-after:"+ModIDs.GAPI+"; after:"+ModIDs.MD8+"; after:"+ModIDs.IC2+"; after:"+ModIDs.IC2C+"; after:"+ModIDs.NC+"; after:"+ModIDs.IHL+"; after:"+ModIDs.FMB+"; after:"+ModIDs.BAUBLES+"; after:"+ModIDs.GaSu+"; after:"+ModIDs.GaNe+"; after:"+ModIDs.GaEn+"; after:"+ModIDs.WdSt+"; after:"+ModIDs.CrGu+"; after:"+ModIDs.COFH_API+"; after:"+ModIDs.COFH_API_ENERGY+"; after:"+ModIDs.CC+"; after:"+ModIDs.OC+"; after:"+ModIDs.DE+"; after:"+ModIDs.FR+"; after:"+ModIDs.FRMB+"; after:"+ModIDs.BINNIE+"; after:"+ModIDs.BINNIE_BEE+"; after:"+ModIDs.BINNIE_TREE+"; after:"+ModIDs.BINNIE_GENETICS+"; after:"+ModIDs.BINNIE_BOTANY+"; after:"+ModIDs.IE+"; after:"+ModIDs.UB+"; after:"+ModIDs.COG+"; after:"+ModIDs.PFAA+"; after:"+ModIDs.ARS+"; after:"+ModIDs.TC+"; after:"+ModIDs.TCFM+"; after:"+ModIDs.BOTA+"; after:"+ModIDs.ALF+"; after:"+ModIDs.WTCH+"; after:"+ModIDs.HOWL+"; after:"+ModIDs.MoCr+"; after:"+ModIDs.GoG+"; after:"+ModIDs.LycM+"; after:"+ModIDs.LycM_Arctic+"; after:"+ModIDs.LycM_Demon+"; after:"+ModIDs.LycM_Desert+"; after:"+ModIDs.LycM_Forest+"; after:"+ModIDs.LycM_Fresh+"; after:"+ModIDs.LycM_Inferno+"; after:"+ModIDs.LycM_Jungle+"; after:"+ModIDs.LycM_Mountain+"; after:"+ModIDs.LycM_Plains+"; after:"+ModIDs.LycM_Salt+"; after:"+ModIDs.LycM_Shadow+"; after:"+ModIDs.LycM_Swamp+"; after:"+ModIDs.RC+"; after:"+ModIDs.BP+"; after:"+ModIDs.PR+"; after:"+ModIDs.PR_EXPANSION+"; after:"+ModIDs.PR_INTEGRATION+"; after:"+ModIDs.PR_TRANSMISSION+"; after:"+ModIDs.PR_TRANSPORT+"; after:"+ModIDs.PR_EXPLORATION+"; after:"+ModIDs.PR_COMPATIBILITY+"; after:"+ModIDs.PR_FABRICATION+"; after:"+ModIDs.PR_ILLUMINATION+"; after:"+ModIDs.PE+"; after:"+ModIDs.AE+"; after:"+ModIDs.MO+"; after:"+ModIDs.TE_FOUNDATION+"; after:"+ModIDs.TE_DYNAMICS+"; after:"+ModIDs.TE+"; after:"+ModIDs.ZTONES+"; after:"+ModIDs.CHSL+"; after:"+ModIDs.EtFu+"; after:"+ModIDs.BB+"; after:"+ModIDs.DYNAMIC_TREES+"; after:"+ModIDs.BbLC+"; after:"+ModIDs.CARP+"; after:"+ModIDs.BETTER_RECORDS+"; after:"+ModIDs.TF+"; after:"+ModIDs.ERE+"; after:"+ModIDs.MFR+"; after:"+ModIDs.PnC+"; after:"+ModIDs.ExU+"; after:"+ModIDs.ExS+"; after:"+ModIDs.EIO+"; after:"+ModIDs.RT+"; after:"+ModIDs.AA+"; after:"+ModIDs.HaC+"; after:"+ModIDs.CookBook+"; after:"+ModIDs.APC+"; after:"+ModIDs.ENVM+"; after:"+ModIDs.MaCr+"; after:"+ModIDs.BC_TRANSPORT+"; after:"+ModIDs.BC_SILICON+"; after:"+ModIDs.BC_FACTORY+"; after:"+ModIDs.BC_ENERGY+"; after:"+ModIDs.BC_ROBOTICS+"; after:"+ModIDs.BC+"; after:"+ModIDs.BC_BUILDERS+"; after:"+ModIDs.MgC+"; after:"+ModIDs.BR+"; after:"+ModIDs.HBM+"; after:"+ModIDs.DRGN+"; after:"+ModIDs.ElC+"; after:"+ModIDs.CrC+"; after:"+ModIDs.ReC+"; after:"+ModIDs.RoC+"; after:"+ModIDs.Mek+"; after:"+ModIDs.Mek_Tools+"; after:"+ModIDs.Mek_Generators+"; after:"+ModIDs.GC+"; after:"+ModIDs.GC_PLANETS+"; after:"+ModIDs.GC_GALAXYSPACE+"; after:"+ModIDs.VULPES+"; after:"+ModIDs.GC_ADV_ROCKETRY+"; after:"+ModIDs.BTL+"; after:"+ModIDs.AETHER+"; after:"+ModIDs.TROPIC+"; after:"+ModIDs.ATUM+"; after:"+ModIDs.EB+"; after:"+ModIDs.EBXL+"; after:"+ModIDs.BoP+"; after:"+ModIDs.HiL+"; after:"+ModIDs.ATG+"; after:"+ModIDs.RTG+"; after:"+ModIDs.RWG+"; after:"+ModIDs.MYST+"; after:"+ModIDs.WARPBOOK+"; after:"+ModIDs.LOSTBOOKS+"; after:"+ModIDs.EUREKA+"; after:"+ModIDs.ENCHIRIDION+"; after:"+ModIDs.ENCHIRIDION2+"; after:"+ModIDs.SmAc+"; after:"+ModIDs.HQM+"; after:"+ModIDs.JABBA+"; after:"+ModIDs.MaCu+"; after:"+ModIDs.PdC+"; after:"+ModIDs.Bamboo+"; after:"+ModIDs.GrC+"; after:"+ModIDs.GrC_Apples+"; after:"+ModIDs.GrC_Bamboo+"; after:"+ModIDs.GrC_Bees+"; after:"+ModIDs.GrC_Cellar+"; after:"+ModIDs.GrC_Fish+"; after:"+ModIDs.GrC_Grapes+"; after:"+ModIDs.GrC_Hops+"; after:"+ModIDs.GrC_Milk+"; after:"+ModIDs.GrC_Rice+"; after:"+ModIDs.BWM+"; after:"+ModIDs.OMT+"; after:"+ModIDs.TG+"; after:"+ModIDs.FM+"; after:"+ModIDs.FZ+"; after:"+ModIDs.MNTL+"; after:"+ModIDs.OB+"; after:"+ModIDs.TiC+"; after:"+ModIDs.WR_CBE_C+"; after:"+ModIDs.WR_CBE_A+"; after:"+ModIDs.WR_CBE_L+"; after:"+ModIDs.VOLTZ+"; after:"+ModIDs.MFFS+"; after:"+ModIDs.ICBM+"; after:"+ModIDs.ATSCI+"; after:inventorytweaks; after:ironbackpacks; after:journeymap; after:LogisticsPipes; after:LunatriusCore; after:NEIAddons; after:NEIAddons|Developer; after:NEIAddons|AppEng; after:NEIAddons|Botany; after:NEIAddons|Forestry; after:NEIAddons|CraftingTables; after:NEIAddons|ExNihilo; after:neiintegration; after:openglasses; after:simplyjetpacks; after:Stackie; after:StevesCarts; after:TiCTooltips; after:worldedit; after:McMultipart")
69
+@Mod(modid=ModIDs.GAPI_POST, name="Greg-API-Post", version="GT6-MC1710", dependencies="required-after:"+ModIDs.GAPI+"; after:"+ModIDs.MD8+"; after:"+ModIDs.IC2+"; after:"+ModIDs.IC2C+"; after:"+ModIDs.NC+"; after:"+ModIDs.IHL+"; after:"+ModIDs.FMB+"; after:"+ModIDs.BAUBLES+"; after:"+ModIDs.GaSu+"; after:"+ModIDs.GaNe+"; after:"+ModIDs.GaEn+"; after:"+ModIDs.WdSt+"; after:"+ModIDs.CrGu+"; after:"+ModIDs.COFH_API+"; after:"+ModIDs.COFH_API_ENERGY+"; after:"+ModIDs.CC+"; after:"+ModIDs.OC+"; after:"+ModIDs.DE+"; after:"+ModIDs.FR+"; after:"+ModIDs.FRMB+"; after:"+ModIDs.BINNIE+"; after:"+ModIDs.BINNIE_BEE+"; after:"+ModIDs.BINNIE_TREE+"; after:"+ModIDs.BINNIE_GENETICS+"; after:"+ModIDs.BINNIE_BOTANY+"; after:"+ModIDs.IE+"; after:"+ModIDs.UB+"; after:"+ModIDs.COG+"; after:"+ModIDs.PFAA+"; after:"+ModIDs.ARS+"; after:"+ModIDs.TC+"; after:"+ModIDs.TCFM+"; after:"+ModIDs.BOTA+"; after:"+ModIDs.ALF+"; after:"+ModIDs.WTCH+"; after:"+ModIDs.HOWL+"; after:"+ModIDs.MoCr+"; after:"+ModIDs.GoG+"; after:"+ModIDs.LycM+"; after:"+ModIDs.LycM_Arctic+"; after:"+ModIDs.LycM_Demon+"; after:"+ModIDs.LycM_Desert+"; after:"+ModIDs.LycM_Forest+"; after:"+ModIDs.LycM_Fresh+"; after:"+ModIDs.LycM_Inferno+"; after:"+ModIDs.LycM_Jungle+"; after:"+ModIDs.LycM_Mountain+"; after:"+ModIDs.LycM_Plains+"; after:"+ModIDs.LycM_Salt+"; after:"+ModIDs.LycM_Shadow+"; after:"+ModIDs.LycM_Swamp+"; after:"+ModIDs.RC+"; after:"+ModIDs.BP+"; after:"+ModIDs.PR+"; after:"+ModIDs.PR_EXPANSION+"; after:"+ModIDs.PR_INTEGRATION+"; after:"+ModIDs.PR_TRANSMISSION+"; after:"+ModIDs.PR_TRANSPORT+"; after:"+ModIDs.PR_EXPLORATION+"; after:"+ModIDs.PR_COMPATIBILITY+"; after:"+ModIDs.PR_FABRICATION+"; after:"+ModIDs.PR_ILLUMINATION+"; after:"+ModIDs.PE+"; after:"+ModIDs.AE+"; after:"+ModIDs.MO+"; after:"+ModIDs.TE_FOUNDATION+"; after:"+ModIDs.TE_DYNAMICS+"; after:"+ModIDs.TE+"; after:"+ModIDs.ZTONES+"; after:"+ModIDs.CHSL+"; after:"+ModIDs.EtFu+"; after:"+ModIDs.BB+"; after:"+ModIDs.DYNAMIC_TREES+"; after:"+ModIDs.BbLC+"; after:"+ModIDs.CARP+"; after:"+ModIDs.BETTER_RECORDS+"; after:"+ModIDs.TF+"; after:"+ModIDs.ERE+"; after:"+ModIDs.MFR+"; after:"+ModIDs.PnC+"; after:"+ModIDs.ExU+"; after:"+ModIDs.ExS+"; after:"+ModIDs.EIO+"; after:"+ModIDs.RT+"; after:"+ModIDs.AA+"; after:"+ModIDs.HaC+"; after:"+ModIDs.CookBook+"; after:"+ModIDs.APC+"; after:"+ModIDs.ENVM+"; after:"+ModIDs.MaCr+"; after:"+ModIDs.BC_TRANSPORT+"; after:"+ModIDs.BC_SILICON+"; after:"+ModIDs.BC_FACTORY+"; after:"+ModIDs.BC_ENERGY+"; after:"+ModIDs.BC_ROBOTICS+"; after:"+ModIDs.BC+"; after:"+ModIDs.BC_BUILDERS+"; after:"+ModIDs.MgC+"; after:"+ModIDs.BR+"; after:"+ModIDs.HBM+"; after:"+ModIDs.DRGN+"; after:"+ModIDs.ElC+"; after:"+ModIDs.CrC+"; after:"+ModIDs.ReC+"; after:"+ModIDs.RoC+"; after:"+ModIDs.Mek+"; after:"+ModIDs.Mek_Tools+"; after:"+ModIDs.Mek_Generators+"; after:"+ModIDs.GC+"; after:"+ModIDs.GC_PLANETS+"; after:"+ModIDs.GC_GALAXYSPACE+"; after:"+ModIDs.VULPES+"; after:"+ModIDs.GC_ADV_ROCKETRY+"; after:"+ModIDs.BTL+"; after:"+ModIDs.AETHER+"; after:"+ModIDs.TROPIC+"; after:"+ModIDs.ATUM+"; after:"+ModIDs.EB+"; after:"+ModIDs.EBXL+"; after:"+ModIDs.BoP+"; after:"+ModIDs.HiL+"; after:"+ModIDs.ATG+"; after:"+ModIDs.RTG+"; after:"+ModIDs.RWG+"; after:"+ModIDs.MYST+"; after:"+ModIDs.WARPBOOK+"; after:"+ModIDs.LOSTBOOKS+"; after:"+ModIDs.EUREKA+"; after:"+ModIDs.ENCHIRIDION+"; after:"+ModIDs.ENCHIRIDION2+"; after:"+ModIDs.SmAc+"; after:"+ModIDs.HQM+"; after:"+ModIDs.JABBA+"; after:"+ModIDs.MaCu+"; after:"+ModIDs.PdC+"; after:"+ModIDs.Bamboo+"; after:"+ModIDs.Fossil+"; after:"+ModIDs.GrC+"; after:"+ModIDs.GrC_Apples+"; after:"+ModIDs.GrC_Bamboo+"; after:"+ModIDs.GrC_Bees+"; after:"+ModIDs.GrC_Cellar+"; after:"+ModIDs.GrC_Fish+"; after:"+ModIDs.GrC_Grapes+"; after:"+ModIDs.GrC_Hops+"; after:"+ModIDs.GrC_Milk+"; after:"+ModIDs.GrC_Rice+"; after:"+ModIDs.BWM+"; after:"+ModIDs.OMT+"; after:"+ModIDs.TG+"; after:"+ModIDs.FM+"; after:"+ModIDs.FZ+"; after:"+ModIDs.MNTL+"; after:"+ModIDs.OB+"; after:"+ModIDs.TiC+"; after:"+ModIDs.WR_CBE_C+"; after:"+ModIDs.WR_CBE_A+"; after:"+ModIDs.WR_CBE_L+"; after:"+ModIDs.VOLTZ+"; after:"+ModIDs.MFFS+"; after:"+ModIDs.ICBM+"; after:"+ModIDs.ATSCI+"; after:inventorytweaks; after:ironbackpacks; after:journeymap; after:LogisticsPipes; after:LunatriusCore; after:NEIAddons; after:NEIAddons|Developer; after:NEIAddons|AppEng; after:NEIAddons|Botany; after:NEIAddons|Forestry; after:NEIAddons|CraftingTables; after:NEIAddons|ExNihilo; after:neiintegration; after:openglasses; after:simplyjetpacks; after:Stackie; after:StevesCarts; after:TiCTooltips; after:worldedit; after:McMultipart")
70 70
 public class GT_API_Post extends Abstract_Mod {
71 71
 	public GT_API_Post() {GAPI_POST = this;}
72 72
 	

+ 1
- 0
src/main/java/gregapi/data/CS.java View File

@@ -1738,6 +1738,7 @@ public class CS {
1738 1738
 		, GoG               = "GrimoireOfGaia"
1739 1739
 		, PdC               = "psychedelicraft"
1740 1740
 		, Bamboo            = "BambooMod"
1741
+		, Fossil            = "fossil"
1741 1742
 		, GrC               = "Growthcraft"
1742 1743
 		, GrC_Apples        = "Growthcraft|Apples"
1743 1744
 		, GrC_Cellar        = "Growthcraft|Cellar"

+ 1
- 0
src/main/java/gregapi/data/MD.java View File

@@ -146,6 +146,7 @@ public class MD {
146 146
 	, GoG               = new ModData(ModIDs.GoG                , "Grimoire of Gaia")
147 147
 	, PdC               = new ModData(ModIDs.PdC                , "Psychedelicraft") // Wait, why did I add some compat to this Drug Mod again!?!
148 148
 	, Bamboo            = new ModData(ModIDs.Bamboo             , "Bamboo Mod")
149
+	, Fossil            = new ModData(ModIDs.Fossil             , "Fossils and Archeology")
149 150
 	, GrC               = new ModData(ModIDs.GrC                , "Growthcraft")
150 151
 	, GrC_Apples        = new ModData(ModIDs.GrC_Apples         , "Growthcraft Apples")
151 152
 	, GrC_Cellar        = new ModData(ModIDs.GrC_Cellar         , "Growthcraft Cellar")

+ 22
- 18
src/main/java/gregapi/data/MT.java View File

@@ -114,13 +114,13 @@ public class MT {
114 114
 	static OreDictMaterial lqudaciddcmp (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return lqudacid        (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(DECOMPOSABLE);}
115 115
 	static OreDictMaterial lqudacidcent (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return lqudaciddcmp    (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(CENTRIFUGE);}
116 116
 	static OreDictMaterial lqudacidelec (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return lqudaciddcmp    (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(ELECTROLYSER);}
117
-	static OreDictMaterial dust         (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_DUST);}
117
+	static OreDictMaterial dust         (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_DUST).setPriorityPrefix(OP.dust);}
118 118
 	static OreDictMaterial dustdcmp     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dust            (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(DECOMPOSABLE);}
119 119
 	static OreDictMaterial dustcent     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dustdcmp        (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(CENTRIFUGE);}
120 120
 	static OreDictMaterial dustelec     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dustdcmp        (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(ELECTROLYSER);}
121
-	static OreDictMaterial glowstone    (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return oredustcent     (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(PLATES, STICKS, MORTAR, BRITTLE, UNBURNABLE, MELTING, CRYSTAL, GLOWING, LIGHTING).addReRegistrations(ANY.Glowstone);}
122
-	static OreDictMaterial redstone     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return oredustcent     (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(PLATES, STICKS, MORTAR, BRITTLE, UNBURNABLE, MELTING, CRYSTAL, G_GEM_ORES_TRANSPARENT);}
123
-	static OreDictMaterial coal         (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return elec            (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES, BRITTLE, FLAMMABLE, MORTAR);}
121
+	static OreDictMaterial glowstone    (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return oredustcent     (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(PLATES, STICKS, MORTAR, BRITTLE, UNBURNABLE, MELTING, CRYSTAL, GLOWING, LIGHTING).setPriorityPrefix(OP.dust).addReRegistrations(ANY.Glowstone);}
122
+	static OreDictMaterial redstone     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return oredustcent     (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(PLATES, STICKS, MORTAR, BRITTLE, UNBURNABLE, MELTING, CRYSTAL, G_GEM_ORES_TRANSPARENT).setPriorityPrefix(OP.dust);}
123
+	static OreDictMaterial coal         (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return elec            (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES, BRITTLE, FLAMMABLE, MORTAR).setPriorityPrefix(OP.gem);}
124 124
 	static OreDictMaterial wax          (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dust            (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(FOILS, PLATES, INGOTS, PARTS, FURNACE, MELTING, BRITTLE, MORTAR, EXTRUDER, EXTRUDER_SIMPLE).addReRegistrations(ANY.Wax);}
125 125
 	static OreDictMaterial meat         (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dustfood        (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(MEAT, INGOTS, MELTING, EXTRUDER, EXTRUDER_SIMPLE);}
126 126
 	static OreDictMaterial grain        (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dustfood        (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(FLAMMABLE).addReRegistrations(ANY.Grains, ANY.FlourGrains);}
@@ -129,8 +129,8 @@ public class MT {
129 129
 	static OreDictMaterial dustfood     (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return dust            (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(FOOD, MORTAR);}
130 130
 	static OreDictMaterial mixfood      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return mixdust         (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(FOOD, MORTAR);}
131 131
 	static OreDictMaterial dye          (int aID, String aNameOreDict                    , long aR, long aG, long aB             )  {return dust            (aID, aNameOreDict, SET_FOOD, aR, aG, aB, 255).aspects(TC.SENSUS, 1).put(DONT_SHOW_THIS_COMPONENT);}
132
-	static OreDictMaterial quartz       (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_QUARTZ_ORES, MORTAR, BRITTLE, QUARTZ, BLACKLISTED_SMELTER).setSmelting(SiO2, U);}
133
-	static OreDictMaterial gem          (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES);}
132
+	static OreDictMaterial quartz       (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_QUARTZ_ORES, MORTAR, BRITTLE, QUARTZ, BLACKLISTED_SMELTER).setSmelting(SiO2, U).setPriorityPrefix(OP.gem);}
133
+	static OreDictMaterial gem          (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES).setPriorityPrefix(OP.gem);}
134 134
 	static OreDictMaterial gemdcmp      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return gem             (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(DECOMPOSABLE);}
135 135
 	static OreDictMaterial gemcent      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return gemdcmp         (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(CENTRIFUGE);}
136 136
 	static OreDictMaterial gemelec      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return gemdcmp         (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(ELECTROLYSER);}
@@ -139,7 +139,7 @@ public class MT {
139 139
 	static OreDictMaterial stonedcmp    (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return stone           (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(DECOMPOSABLE);}
140 140
 	static OreDictMaterial stonecent    (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return stonedcmp       (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(CENTRIFUGE);}
141 141
 	static OreDictMaterial stoneelec    (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return stonedcmp       (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(ELECTROLYSER);}
142
-	static OreDictMaterial crystal      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES_TRANSPARENT, CRYSTAL);}
142
+	static OreDictMaterial crystal      (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return create          (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(G_GEM_ORES_TRANSPARENT, CRYSTAL).setPriorityPrefix(OP.gem);}
143 143
 	static OreDictMaterial crystal_tc   (int aID, String aNameOreDict, long aR, long aG, long aB, long aA, byte aColor           )  {return crystal         (aID, aNameOreDict, SET_SHARDS, aR, aG, aB, aA).lens(aColor).put(MAGICAL, UNBURNABLE, MD.TC).addReRegistrations(ANY.ThaumCrystal).visDefault();}
144 144
 	static OreDictMaterial crystaldcmp  (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return crystal         (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(DECOMPOSABLE);}
145 145
 	static OreDictMaterial crystalcent  (int aID, String aNameOreDict, TextureSet[] aSets, long aR, long aG, long aB, long aA    )  {return crystaldcmp     (aID, aNameOreDict, aSets, aR, aG, aB, aA).put(CENTRIFUGE);}
@@ -269,9 +269,9 @@ public class MT {
269 269
 	Na      = alkali        (  110, "Sodium"                , "Na"      ,  11,  11,   370,  1156,  0.971     , SET_ROUGH            ,   0,   0, 150, 255).put(  G_INGOT_ORES                , FUSION, UUM                                       ).aspects(  TC.VITREUS, 2, TC.LUX, 1                        ).put(TICKS_PER_SMELT*20, "Natrium"),
270 270
 	Mg      = alkaline      (  120, "Magnesium"             , "Mg"      ,  12,  12,   923,  1363,  1.738     , SET_METALLIC         , 255, 200, 200, 255).put(  G_INGOT_ORES                , FUSION, UUM                                       ).aspects(  TC.METALLUM, 2, TC.SANO, 1                      ).put(MOLTEN),
271 271
 	Al      = posttrans     (  130, "Aluminium"             , "Al"      ,  13,  13,   933,  2792,  2.698     , SET_METALLIC         , 128, 200, 240, 255).put(  G_INGOT_MACHINE_ORES        , FUSION, UUM, ICOSAGEN                             ).aspects(  TC.METALLUM, 2, TC.VOLATUS, 1                   ).qual(2, 10.0, 128, 2).put(RAILS, MOLTEN, "Aluminum", "NaturalAluminum"),
272
-	Si      = metalloid     (  140, "Silicon"               , "Si"      ,  14,  14,  1687,  3538,  2.3296    , SET_METALLIC         ,  60,  60,  80, 255).put(  G_INGOT_ORES                , FUSION, UUM, CRYSTALLOGEN                         ).aspects(  TC.METALLUM, 2, TC.TENEBRAE, 1                  ).put(MOLTEN),
272
+	Si      = metalloid     (  140, "Silicon"               , "Si"      ,  14,  14,  1687,  3538,  2.3296    , SET_METALLIC         ,  60,  60,  80, 255).put(  G_INGOT_ORES                , FUSION, UUM, CRYSTALLOGEN                         ).aspects(  TC.METALLUM, 2, TC.TENEBRAE, 1                  ).put(MOLTEN).setPriorityPrefix(OP.plateGem),
273 273
 	P       = polyatomic    (  150, "Phosphor"              , "P"       ,  15,  15,   317,   550,  1.82      , SET_FINE             , 255, 255,   0, 255).put(  G_CRYSTAL_ORES              , FUSION, UUM, PNICTOGEN                            ).aspects(  TC.IGNIS, 2, TC.POTENTIA, 1                     ).put(FLAMMABLE, EXPLOSIVE, BRITTLE, MORTAR),
274
-	S       = polyatomic    (  160, "Sulfur"                , "S"       ,  16,  16,   388,   717,  2.067     , SET_FINE             , 234, 234,   0, 255).put(  G_CRYSTAL_ORES              , FUSION, UUM, CHALCOGEN                            ).aspects(  TC.IGNIS, 1                                     ).put(FLAMMABLE, MELTING, MOLTEN, BRITTLE, MORTAR, TICKS_PER_SMELT*5, "Sulphur"),
274
+	S       = polyatomic    (  160, "Sulfur"                , "S"       ,  16,  16,   388,   717,  2.067     , SET_FINE             , 234, 234,   0, 255).put(  G_CRYSTAL_ORES              , FUSION, UUM, CHALCOGEN                            ).aspects(  TC.IGNIS, 1                                     ).put(FLAMMABLE, MELTING, MOLTEN, BRITTLE, MORTAR, TICKS_PER_SMELT*5, "Sulphur").setPriorityPrefix(OP.dust),
275 275
 	Cl      = diatomic      (  170, "Chlorine"              , "Cl"      ,  17,  18,   171,   239,  0.003214  , SET_DULL             ,   0, 240, 255, 255).put(  CONTAINERS_FLUID            , FUSION, UUM, HALOGEN                              ).aspects(  TC.AQUA, 2, TC.PANNUS, 1                        ).put(GASSES),
276 276
 	Ar      = noblegas      (  180, "Argon"                 , "Ar"      ,  18,  22,    83,    87,  0.0017837 , SET_SHINY            ,   0, 255,   0,  15).put(  CONTAINERS_GAS              , FUSION, UUM                                       ).aspects(  TC.AER, 3                                       ),
277 277
 	K       = alkali        (  190, "Potassium"             , "K"       ,  19,  20,   336,  1032,  0.862     , SET_ROUGH            , 250, 250, 250, 255).put(  G_INGOT_ORES                , FUSION, UUM                                       ).aspects(  TC.VITREUS, 1, TC.POTENTIA, 1                   ).put("Kalium"),
@@ -764,7 +764,7 @@ public class MT {
764 764
 	CaF2                    = gemdcmp       ( 9215, "Fluorite"              , SET_RUBY              ,  50, 255,  50, 255).put(MELTING, MOLTEN, INGOTS, MORTAR, ACID)                                                                                                    .uumMcfg( 0, Ca             , 1*U, F                , 2*U)                                                                                                  .heat(1633), Fluorite = CaF2,
765 765
 	
766 766
 	
767
-	LiCl                    = oredustdcmp   ( 8029, "Lithium Chloride"      , SET_CUBE              , 222, 222, 250, 255).put(MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Li             , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).heat( 880, 1655), // Can be electrolyzed for real
767
+	LiCl                    = oredustdcmp   ( 8029, "Lithium Chloride"      , SET_CUBE              , 222, 222, 250, 255).put(MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Li             , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).setPriorityPrefix(OP.dust).heat( 880, 1655), // Can be electrolyzed for real
768 768
 	LiClO3                  = dustdcmp      ( 8033, "Lithium Chlorate"      , SET_ROUGH             , 222, 233, 250, 255).put(MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Li             , 1*U, Cl               , 1*U, O                , 3*U)                                                                          .heat( 400),
769 769
 	LiClO4                  = dustdcmp      ( 8034, "Lithium Perchlorate"   , SET_ROUGH             , 222, 244, 250, 255).put(MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Li             , 1*U, Cl               , 1*U, O                , 4*U)                                                                          .heat( 509,  703),
770 770
 	Li2O                    = dustelec      ( 8004, "Lithium Oxide"         , SET_ROUGH             , 222, 222, 234, 255).put(MD.IHL)                                                                                                                                   .uumMcfg( 0, Li             , 2*U, O                , 1*U)                                                                                                  ,
@@ -772,8 +772,8 @@ public class MT {
772 772
 	LiOH                    = dustelec      ( 8032, "Lithium Hydroxide"     , SET_CUBE              , 222, 202, 250, 255)                                                                                                                                               .uumMcfg( 0, Li             , 1*U, O                , 1*U, H                , 1*U)                                                                          .heat( 735, 1197),
773 773
 	
774 774
 	
775
-	NaCl                    = oredustdcmp   ( 8204, "Salt"                  , SET_CUBE              , 250, 250, 250, 255).put(BRITTLE, MORTAR, FOOD)                                                                                                                    .uumMcfg( 0, Na             , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).heat(1074, 1686),
776
-	NaNO3                   = oredustelec   ( 8019, "Sodium Nitrate"        , SET_FINE              , 230, 230, 230, 255).put(FLAMMABLE, BRITTLE, MORTAR)                                                                                                               .uumMcfg( 0, Na             , 1*U, N                , 1*U, O                , 3*U)                                                                          .aspects(TC.IGNIS, 2),
775
+	NaCl                    = oredustdcmp   ( 8204, "Salt"                  , SET_CUBE              , 250, 250, 250, 255).put(BRITTLE, MORTAR, FOOD)                                                                                                                    .uumMcfg( 0, Na             , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).setPriorityPrefix(OP.dust).heat(1074, 1686),
776
+	NaNO3                   = oredustelec   ( 8019, "Sodium Nitrate"        , SET_FINE              , 230, 230, 230, 255).put(FLAMMABLE, BRITTLE, MORTAR)                                                                                                               .uumMcfg( 0, Na             , 1*U, N                , 1*U, O                , 3*U)                                                                          .aspects(TC.IGNIS, 2).setPriorityPrefix(OP.dust),
777 777
 	NaOH                    = dustelec      ( 8268, "Sodium Hydroxide"      , SET_CUBE              , 220, 250, 220, 255).put(MD.IHL)                                                                                                                                   .uumMcfg( 0, Na             , 1*U, O                , 1*U, H                , 1*U)                                                                          ,
778 778
 	NaHSO4                  = dustdcmp      ( 8230, "Sodium Bisulfate"      , SET_FINE              , 240, 240, 255, 255).put(MD.IHL, "SodiumBisulphate", "SodiumHydrogenSulfate", "SodiumHydrogenSulphate")                                                            .uumMcfg( 0, Na             , 1*U, H                , 1*U, S                , 1*U, O                , 4*U)                                                  ,
779 779
 	NaSO4                   = dustdcmp      ( 9822, "Sodium Persulfate"     , SET_CUBE              , 130, 180, 250, 255).put("SodiumPersulphate")                                                                                                                      .uumMcfg( 0, Na             , 1*U, S                , 1*U, O                , 4*U)                                                                          ,
@@ -786,8 +786,8 @@ public class MT {
786 786
 	Na3AlF6                 = oredustdcmp   ( 8009, "Cryolite"              , SET_DULL              , 200, 190, 190, 255).put(MELTING, MOLTEN, INGOTS, ACID)                                                                                                            .uumMcfg( 0, Na             , 3*U, Al               , 1*U, F                , 6*U)                                                                          .heat(1285), Cryolite = Na3AlF6,
787 787
 	
788 788
 	
789
-	KCl                     = oredustdcmp   ( 8203, "Rock Salt"             , SET_CUBE              , 240, 200, 200, 255).put(BRITTLE, MORTAR)                                                                                                                          .uumMcfg( 0, K              , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).heat(1040, 1690),
790
-	KNO3                    = oredustelec   ( 8205, "Potassium Nitrate"     , SET_FINE              , 230, 230, 230, 255).put(FLAMMABLE, BRITTLE, MORTAR, "Saltpeter")                                                                                                  .uumMcfg( 0, K              , 1*U, N                , 1*U, O                , 3*U)                                                                          .aspects(TC.IGNIS, 2),
789
+	KCl                     = oredustdcmp   ( 8203, "Rock Salt"             , SET_CUBE              , 240, 200, 200, 255).put(BRITTLE, MORTAR)                                                                                                                          .uumMcfg( 0, K              , 1*U, Cl               , 1*U)                                                                                                  .aspects(TC.FAMES, 1).setPriorityPrefix(OP.dust).heat(1040, 1690),
790
+	KNO3                    = oredustelec   ( 8205, "Potassium Nitrate"     , SET_FINE              , 230, 230, 230, 255).put(FLAMMABLE, BRITTLE, MORTAR, "Saltpeter")                                                                                                  .uumMcfg( 0, K              , 1*U, N                , 1*U, O                , 3*U)                                                                          .aspects(TC.IGNIS, 2).setPriorityPrefix(OP.dust),
791 791
 	KOH                     = dustelec      ( 8015, "Potassium Hydroxide"   , SET_CUBE              , 250, 220, 220, 255)                                                                                                                                               .uumMcfg( 0, K              , 1*U, O                , 1*U, H                , 1*U)                                                                          ,
792 792
 	KHSO4                   = dustdcmp      ( 8232, "Potassium Bisulfate"   , SET_FINE              , 255, 240, 240, 255).put("PotassiumBisulphate")                                                                                                                    .uumMcfg( 0, K              , 1*U, H                , 1*U, S                , 1*U, O                , 4*U)                                                  ,
793 793
 	KSO4                    = dustdcmp      ( 8022, "Potassium Persulfate"  , SET_CUBE              , 250, 180, 130, 255).put("PotassiumPersulphate")                                                                                                                   .uumMcfg( 0, K              , 1*U, S                , 1*U, O                , 4*U)                                                                          ,
@@ -1038,6 +1038,7 @@ public class MT {
1038 1038
 	Amethyst                = valgemelec    ( 8313, "Amethyst"              , SET_RUBY              , 200,  50, 200, 127).lens(DYE_INDEX_Pink       )                                                                                                                   .uumMcfg( 0, SiO2           , 4*U, Fe               , 1*U)                                                                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM                   , 6).qual(3,  7.0,   256,  3),
1039 1039
 	Dioptase                = valgemelec    ( 8325, "Dioptase"              , SET_EMERALD           ,   0, 180, 180, 127).lens(DYE_INDEX_Cyan       )                                                                                                                   .uumMcfg( 0, SiO2           , 3*U, Cu               , 1*U, O                , 1*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 3, TC.LUCRUM, 3, TC.PERMUTATIO , 2).qual(3,  7.0,   256,  2),
1040 1040
 	Amber                   = valgem        ( 8310, "Amber"                 , SET_RUBY              , 255, 180,   0, 127).lens(DYE_INDEX_Orange     ).put(MORTAR, CRYSTALLISABLE)                                                                                                                                                                                                                                                   .aspects(TC.VITREUS, 1, TC.VINCULUM                 , 2).qual(3,  4.0,   128,  2),
1041
+	AmberDominican          = valgem        ( 8422, "DominicanAmber"        , SET_RUBY              ,  80,  80, 240, 127).lens(DYE_INDEX_Blue       ).put(MORTAR, CRYSTALLISABLE)                                                                                                                                                                                                                                                   .aspects(TC.VITREUS, 1, TC.VINCULUM                 , 2).qual(3,  4.0,   256,  2),
1041 1042
 	Craponite               = valgem        ( 8322, "Craponite"             , SET_FLINT             , 255, 170, 185, 127).lens(DYE_INDEX_Magenta    ).put(MORTAR, CRYSTALLISABLE, MD.GT)                                                                                                                                                                                                                                            .aspects(TC.VITREUS, 3, TC.LUCRUM, 3, TC.STRONTIO   , 2).qual(3,  7.0,   256,  2),
1042 1043
 	Jade                    = valgem        ( 8321, "Jade"                  , SET_LAPIS             , 100, 255, 125, 255).lens(DYE_INDEX_Green      ).put(MD.ERE)                                                                                                                                                                                                                                                                   .aspects(TC.VITREUS, 3, TC.LUCRUM                   , 6).qual(3,  8.0,   512,  2),
1043 1044
 	
@@ -1064,7 +1065,7 @@ public class MT {
1064 1065
 	EnderAmethyst           = valgemelec    ( 8329, "AmethystEnder"         , SET_FLINT             , 210,  50, 210, 127).lens(DYE_INDEX_Pink       )                                                                                                                   .setMcfg( 5, SiO2           , 4*U, Fe               , 1*U, Ma               , 1*U)                                                                          .aspects(TC.VITREUS, 4, TC.LUCRUM, 4, TC.ALIENIS, 2).qual(3, 10.0, 2560, 3).setLocal("Ender Amethyst"),
1065 1066
 	EnderPearl              = elec          ( 8318, "EnderPearl"            , SET_SHINY             , 108, 220, 200, 255).put(G_PEARL_TRANSPARENT, CRYSTAL, BRITTLE, MAGICAL, PEARL, MELTING, "Ender")                                                                  .setMcfg(10, Be             , 1*U, K                , 4*U, N                , 5*U, Ma               , 6*U)                                                  .aspects(TC.ALIENIS, 4, TC.ITER, 4, TC.PRAECANTIO, 2).qual(3,  1.0,  16,  1).setLocal("Enderpearl").heat(2723, 3785),
1066 1067
 	EnderEye                = cent          ( 8319, "EnderEye"              , SET_SHINY             , 160, 250, 230, 255).put(G_PEARL_TRANSPARENT, CRYSTAL, BRITTLE, MAGICAL, PEARL, MELTING)                                                                           .setMcfg( 1, EnderPearl     , 1*U, Blaze            , 1*U)                                                                                                  .aspects(TC.SENSUS, 4, TC.ALIENIS, 4, TC.ITER, 4, TC.PRAECANTIO, 3, TC.IGNIS, 2).qual(3,  1.0,   16,  1).setLocal("Endereye").heat(3447, 4978),
1067
-	NetherStar              = create        ( 8320, "Nether Star"           , SET_NETHERSTAR        , 255, 255, 255, 255).put(G_GEM, CRYSTAL, BRITTLE, UNBURNABLE, MAGICAL, GLOWING, MELTING)                                                                                                                                                                                                                                       .qual(3,  8.0,   5120,  4),
1068
+	NetherStar              = crystal       ( 8320, "Nether Star"           , SET_NETHERSTAR        , 255, 255, 255, 255).put(BRITTLE, UNBURNABLE, MAGICAL, GLOWING, MELTING)                                                                                                                                                                                                                                                       .qual(3,  8.0,   5120,  4),
1068 1069
 	
1069 1070
 	
1070 1071
 	Frezarite               = create        ( 8391, "Frezarite"             , SET_NETHERSTAR        , 255, 255, 255, 255).put(G_GEM, CRYSTAL, BRITTLE, MAGICAL)                                                                                                                                                                                                                                                                     .aspects(TC.VITREUS, 3, TC.GELUM, 3).qual(3, 4.0, 128, 2),
@@ -1348,9 +1349,9 @@ public class MT {
1348 1349
 	ElectricalSteel         = alloy         ( 8730, "Electrical Steel"      , SET_METALLIC          , 140, 140, 140, 255).put(MAGNETIC_PASSIVE).qual(Steel)                                                                                                             .uumMcfg( 1, Steel          , 1*U, Si               , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.ELECTRUM, 1).setOriginalMod(MD.EIO).alloyCentrifuge(),
1349 1350
 	ObsidianSteel           = alloy         ( 8731, "Obsidian Steel"        , SET_METALLIC          ,  60,  60,  60, 255).put(MAGNETIC_PASSIVE, RAILS, "DarkSteel").qual(Steel)                                                                                         .setMcfg( 1, Steel          , 1*U, Obsidian         , 9*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.TENEBRAE, 1).setOriginalMod(MD.TG).alloyCentrifuge(),
1350 1351
 	Soularium               = alloy         ( 8732, "Soularium"             , SET_DULL              ,  90,  70,  50, 255).qual(Au)                                                                                                                                      .setMcfg( 1, SoulSand       , 1*U, Au               , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.SPIRITUS, 1).setOriginalMod(MD.EIO).alloyCentrifuge(),
1351
-	RedstoneAlloy           = alloy         ( 8733, "Redstone Alloy"        , SET_METALLIC          , 140,  50,  50, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Redstone         , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.MACHINA, 1).setOriginalMod(MD.EIO).alloyCentrifuge(),
1352
-	NikolineAlloy           = alloy         ( 8737, "Nikoline Alloy"        , SET_METALLIC          ,  50,  90, 140, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Nikolite         , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.POTENTIA, 1).alloyCentrifuge(),
1353
-	TeslatineAlloy          = alloy         ( 8738, "Teslatine Alloy"       , SET_METALLIC          ,  50,  90, 140, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Teslatite        , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.POTENTIA, 1).alloyCentrifuge(),
1352
+	RedstoneAlloy           = alloy         ( 8733, "Redstone Alloy"        , SET_METALLIC          , 140,  50,  50, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Redstone         , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.MACHINA, 1).setOriginalMod(MD.EIO).alloyCentrifuge().setPriorityPrefix(OP.plateGem),
1353
+	NikolineAlloy           = alloy         ( 8737, "Nikoline Alloy"        , SET_METALLIC          ,  50,  90, 140, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Nikolite         , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.POTENTIA, 1).alloyCentrifuge().setPriorityPrefix(OP.plateGem),
1354
+	TeslatineAlloy          = alloy         ( 8738, "Teslatine Alloy"       , SET_METALLIC          ,  50,  90, 140, 255).put(MOLTEN)                                                                                                                                   .uumMcfg( 1, Si             , 1*U, Teslatite        , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.POTENTIA, 1).alloyCentrifuge().setPriorityPrefix(OP.plateGem),
1354 1355
 	SpectreIron             = alloymachine  ( 8734, "Spectre Iron"          , SET_SHINY             , 150, 200, 200, 200).put(MAGNETIC_PASSIVE, MAGICAL, MOLTEN, GLOWING).qual(3,  8.5, 768, 2)                                                                         .setMcfg( 1, WroughtIron    , 1*U, Ectoplasm        , 1*U)                                                                                                  .aspects(TC.METALLUM, 3, TC.SPIRITUS, 3).alloyCentrifuge(Fe),
1355 1356
 	Manasteel               = alloymachine  ( 8720, "Manasteel"             , SET_SHINY             , 110, 200, 250, 255).put(MAGICAL).qual(3, 12.0, 256, 3)                                                                                                                                                                                                                                                                        .aspects(TC.METALLUM, 2, TC.PRAECANTIO, 2).heat(Fe.mMeltingPoint+500, Fe.mBoilingPoint+1000),
1356 1357
 	Terrasteel              = alloymachine  ( 8721, "Terrasteel"            , SET_SHINY             , 110, 200,  50, 255).put(MAGICAL).qual(3, 16.0,2048, 4)                                                                                                                                                                                                                                                                        .aspects(TC.METALLUM, 2, TC.PRAECANTIO, 2).heat(Fe.mMeltingPoint+750, Fe.mBoilingPoint+1500),
@@ -1604,6 +1605,8 @@ public class MT {
1604 1605
 			FishRotten              .put(MD.MaCu);
1605 1606
 			TiO2                    .put(MD.MaCu);
1606 1607
 			
1608
+			AmberDominican          .put(MD.Fossil).visDefault();
1609
+			
1607 1610
 			Draconium               .put(MD.DE).visDefault();
1608 1611
 			DraconiumAwakened       .put(MD.DE).visDefault();
1609 1612
 			
@@ -1781,6 +1784,7 @@ public class MT {
1781 1784
 			Adamantine              .addEnchantmentForTools(Enchantment.silkTouch, 1);
1782 1785
 			Force                   .addEnchantmentForTools(Enchantment.silkTouch, 1);
1783 1786
 			Amber                   .addEnchantmentForTools(Enchantment.silkTouch, 1);
1787
+			AmberDominican          .addEnchantmentForTools(Enchantment.silkTouch, 1);
1784 1788
 			Ambrosium               .addEnchantmentForTools(Enchantment.silkTouch, 1);
1785 1789
 			ManaQuartz              .addEnchantmentForTools(Enchantment.silkTouch, 1);
1786 1790
 			EnderPearl              .addEnchantmentForTools(Enchantment.silkTouch, 1);

+ 1
- 0
src/main/java/gregapi/data/OD.java View File

@@ -123,6 +123,7 @@ public enum OD {
123 123
 	, itemLeatherImpregnated
124 124
 	, itemSkin
125 125
 	, itemFur
126
+	, itemPelt
126 127
 	, itemFertilizer
127 128
 	, itemPlantRemains
128 129
 	, itemGhastTear

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

@@ -30,7 +30,6 @@ import gregapi.code.ICondition;
30 30
 import gregapi.code.ICondition.And;
31 31
 import gregapi.code.ICondition.Or;
32 32
 import gregapi.oredict.OreDictListenerItem_Washing;
33
-import gregapi.oredict.OreDictMaterial;
34 33
 import gregapi.oredict.OreDictMaterialCondition;
35 34
 import gregapi.oredict.OreDictPrefix;
36 35
 import gregapi.util.OM;
@@ -549,19 +548,6 @@ public class OP {
549 548
 		bouleGt             .forceItemGeneration(MT.Si, MT.RedstoneAlloy, MT.NikolineAlloy, MT.TeslatineAlloy);
550 549
 		plateTiny           .forceItemGeneration(MT.Paper);
551 550
 		
552
-		for (OreDictMaterial tMat : ANY.Glowstone.mToThis) tMat.setPriorityPrefix(OP.dust);
553
-		MT.Redstone             .setPriorityPrefix(OP.dust);
554
-		MT.Electrotine          .setPriorityPrefix(OP.dust);
555
-		MT.Nikolite             .setPriorityPrefix(OP.dust);
556
-		MT.Teslatite            .setPriorityPrefix(OP.dust);
557
-		MT.KNO3                 .setPriorityPrefix(OP.dust);
558
-		MT.NaNO3                .setPriorityPrefix(OP.dust);
559
-		MT.S                    .setPriorityPrefix(OP.dust);
560
-		MT.Si                   .setPriorityPrefix(OP.plateGem);
561
-		MT.RedstoneAlloy        .setPriorityPrefix(OP.plateGem);
562
-		MT.NikolineAlloy        .setPriorityPrefix(OP.plateGem);
563
-		MT.TeslatineAlloy       .setPriorityPrefix(OP.plateGem);
564
-		
565 551
 		//-----
566 552
 		
567 553
 		pipeRestrictiveTiny.mByProducts     .add(OM.stack(ANY.Steel             , ring.mAmount));

+ 4
- 0
src/main/java/gregapi/load/LoaderItemData.java View File

@@ -1262,6 +1262,10 @@ public class LoaderItemData implements Runnable {
1262 1262
 		OM.data(MD.UB, "fossilPiece"                        , 1,   W, MT.Bone               ,  U * 1);
1263 1263
 		
1264 1264
 		
1265
+		OM.data(MD.Fossil, "skullBlock"                     , 1,   W, MT.Bone               ,  U * 5);
1266
+		OM.data(MD.Fossil, "skullLantern"                   , 1,   W, MT.Bone               ,  U * 5);
1267
+		
1268
+		
1265 1269
 		OM.data(MD.BB, "boneShard"                          , 1,   W, MT.Bone               ,  U * 2);
1266 1270
 		
1267 1271
 		

+ 51
- 82
src/main/java/gregapi/load/LoaderOreDictReRegistrations.java View File

@@ -75,24 +75,25 @@ public class LoaderOreDictReRegistrations implements Runnable {
75 75
 		
76 76
 		OreDictManager.INSTANCE.addAutoBlackListingForMod(MD.TFC.mID);
77 77
 		
78
-		
79
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("chest"                   , "craftingChest");
80
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("craftingTable"           , "craftingWorkBench");
81
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemCopperWire"          , "craftingWireCopper");
82
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemFertilizer"          , "itemFertiliser");
83
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemFertilizer"          , "fertiliser");
84
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemFertilizer"          , "fertilizer");
85
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemFeather"             , "feather");
86
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemLeather"             , "leather");
87
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemLeather"             , "materialLeather");
88
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemLeatherHardened"     , "materialHardenedleather");
89
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemFur"                 , "fur");
90
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemPelt"                , "pelt");
91
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemRubber"              , "ingotRubber");
92
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemResin"               , "itemRawRubber");
93
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("itemGlue"                , "glue");
94
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("stone"                   , "stoneSmooth");
95
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("cobblestone"             , "stoneCobble");
78
+
79
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemTar                , "tar");
80
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.craftingChest          , "chest");
81
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.craftingWorkBench      , "craftingTable");
82
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.craftingWireCopper     , "itemCopperWire");
83
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemFertilizer         , "itemFertiliser");
84
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemFertilizer         , "fertiliser");
85
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemFertilizer         , "fertilizer");
86
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemFeather            , "feather");
87
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemLeather            , "leather");
88
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemLeather            , "materialLeather");
89
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemLeatherHardened    , "materialHardenedleather");
90
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemFur                , "fur");
91
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemPelt               , "pelt");
92
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemRubber             , "ingotRubber");
93
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemResin              , "itemRawRubber");
94
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OD.itemGlue               , "glue");
95
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OP.stone                  , "stoneSmooth");
96
+		OreDictManager.INSTANCE.addReRegistrationWithReversal(OP.cobblestone            , "stoneCobble");
96 97
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("obsidianRod"             , "stickObsidian");
97 98
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("obsidian"                , "blockSolidObsidian");
98 99
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("stoneObsidian"           , "blockSolidObsidian");
@@ -205,43 +206,10 @@ public class LoaderOreDictReRegistrations implements Runnable {
205 206
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGranite"            , "stoneGranite");
206 207
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockDiorite"            , "stoneDiorite");
207 208
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockAndesite"           , "stoneAndesite");
208
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSalt"               , "blockDustSalt");
209
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSugar"              , "blockDustSugar");
210
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSulfur"             , "blockDustSulfur");
211
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSulphur"            , "blockDustSulphur");
212
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSaltpeter"          , "blockDustSaltpeter");
213
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGunpowder"          , "blockDustGunpowder");
214
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockRedstone"           , "blockDustRedstone");
215
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockNikolite"           , "blockDustNikolite");
216
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockTeslatite"          , "blockDustTeslatite");
217 209
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockVinteum"            , "blockDustVinteum");
218 210
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockVinteumPurified"    , "blockDustVinteumPurified");
219
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockArcaneAsh"          , "blockDustArcaneAsh");
220
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockNetherStar"         , "blockGemNetherStar");
221
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockDiamond"            , "blockGemDiamond");
222
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockEmerald"            , "blockGemEmerald");
223 211
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockLapis"              , "blockGemLapis");
224
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockCoal"               , "blockGemCoal");
225
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockCharcoal"           , "blockGemCharcoal");
226
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockRuby"               , "blockGemRuby");
227
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockBalasRuby"          , "blockGemBalasRuby");
228
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockSapphire"           , "blockGemSapphire");
229
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGreenSapphire"      , "blockGemGreenSapphire");
230
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockOlivine"            , "blockGemOlivine");
231
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockPeridot"            , "blockGemPeridot");
232
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockTanzanite"          , "blockGemTanzanite");
233
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockTopaz"              , "blockGemTopaz");
234
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockBlueTopaz"          , "blockGemBlueTopaz");
235
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockAmethyst"           , "blockGemAmethyst");
236
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockAmethystEnder"      , "blockGemAmethystEnder");
237
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockAmber"              , "blockGemAmber");
238 212
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockMalachite"          , "blockGemMalachite");
239
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockOpal"               , "blockGemOpal");
240
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGarnet"             , "blockGemGarnet");
241
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGarnetRed"          , "blockGemGarnetRed");
242
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockGarnetYellow"       , "blockGemGarnetYellow");
243
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockJade"               , "blockGemJade");
244
-		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockJasper"             , "blockGemJasper");
245 213
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockApatite"            , "blockGemApatite");
246 214
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockFuelCoke"           , "blockGemCoalCoke");
247 215
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("blockChimerite"          , "blockGemChimerite");
@@ -546,37 +514,38 @@ public class LoaderOreDictReRegistrations implements Runnable {
546 514
 		OreDictManager.INSTANCE.addReRegistration("plateAnyWood"                    , "plankAnyWood");
547 515
 		OreDictManager.INSTANCE.addReRegistration(OreDictToolNames.axe              , OreDictToolNames.sawaxe);
548 516
 		OreDictManager.INSTANCE.addReRegistration(OreDictToolNames.saw              , OreDictToolNames.sawaxe);
549
-		OreDictManager.INSTANCE.addReRegistration("stickTin"                        , "craftingToolSolderingMetal");
550
-		OreDictManager.INSTANCE.addReRegistration("stickLead"                       , "craftingToolSolderingMetal");
551
-		OreDictManager.INSTANCE.addReRegistration("stickSolderingAlloy"             , "craftingToolSolderingMetal");
552
-		OreDictManager.INSTANCE.addReRegistration("itemGlue"                        , "craftingPistonGlue");
553
-		OreDictManager.INSTANCE.addReRegistration("itemResin"                       , "craftingPistonGlue");
554
-		OreDictManager.INSTANCE.addReRegistration("slimeball"                       , "craftingPistonGlue");
555
-		OreDictManager.INSTANCE.addReRegistration("slimeballPink"                   , "craftingPistonGlue");
556
-		OreDictManager.INSTANCE.addReRegistration("slimeballSwet"                   , "craftingPistonGlue");
557
-		OreDictManager.INSTANCE.addReRegistration("ingotAnyIron"                    , "craftingPistonIngot");
558
-		OreDictManager.INSTANCE.addReRegistration("ingotAnySteel"                   , "craftingPistonIngot");
559
-		OreDictManager.INSTANCE.addReRegistration("ingotAnyBronze"                  , "craftingPistonIngot");
560
-		OreDictManager.INSTANCE.addReRegistration("ingotAlumite"                    , "craftingPistonIngot");
561
-		OreDictManager.INSTANCE.addReRegistration("ingotAluminium"                  , "craftingPistonIngot");
562
-		OreDictManager.INSTANCE.addReRegistration("ingotAluminiumAlloy"             , "craftingPistonIngot");
563
-		OreDictManager.INSTANCE.addReRegistration("ingotNickel"                     , "craftingPistonIngot");
564
-		OreDictManager.INSTANCE.addReRegistration("ingotInvar"                      , "craftingPistonIngot");
565
-		OreDictManager.INSTANCE.addReRegistration("ingotTitanium"                   , "craftingPistonIngot");
566
-		OreDictManager.INSTANCE.addReRegistration("ingotTungsten"                   , "craftingPistonIngot");
567
-		OreDictManager.INSTANCE.addReRegistration("ingotThaumium"                   , "craftingPistonIngot");
568
-		OreDictManager.INSTANCE.addReRegistration("ingotVoidMetal"                  , "craftingPistonIngot");
569
-		OreDictManager.INSTANCE.addReRegistration("ingotHSLASpringSteel"            , "craftingPistonIngot");
570
-		OreDictManager.INSTANCE.addReRegistration("ingotIronWood"                   , "craftingPistonIngot");
571
-		OreDictManager.INSTANCE.addReRegistration("ingotMagnalium"                  , "craftingPistonIngot");
572
-		OreDictManager.INSTANCE.addReRegistration("ingotUltimet"                    , "craftingPistonIngot");
573
-		OreDictManager.INSTANCE.addReRegistration("ingotManasteel"                  , "craftingPistonIngot");
574
-		OreDictManager.INSTANCE.addReRegistration("ingotTerrasteel"                 , "craftingPistonIngot");
575
-		OreDictManager.INSTANCE.addReRegistration("ingotElvorium"                   , "craftingPistonIngot");
576
-		OreDictManager.INSTANCE.addReRegistration("ingotMauftrium"                  , "craftingPistonIngot");
577
-		OreDictManager.INSTANCE.addReRegistration("ingotDuranium"                   , "craftingPistonIngot");
578
-		OreDictManager.INSTANCE.addReRegistration("ingotTritanium"                  , "craftingPistonIngot");
579
-		OreDictManager.INSTANCE.addReRegistration("ingotSyrmorite"                  , "craftingPistonIngot");
517
+		OreDictManager.INSTANCE.addReRegistration("stickTin"                        , OreDictToolNames.solderingmetal);
518
+		OreDictManager.INSTANCE.addReRegistration("stickLead"                       , OreDictToolNames.solderingmetal);
519
+		OreDictManager.INSTANCE.addReRegistration("stickSolderingAlloy"             , OreDictToolNames.solderingmetal);
520
+		OreDictManager.INSTANCE.addReRegistration(OD.itemTar                        , OD.craftingPistonGlue);
521
+		OreDictManager.INSTANCE.addReRegistration(OD.itemGlue                       , OD.craftingPistonGlue);
522
+		OreDictManager.INSTANCE.addReRegistration(OD.itemResin                      , OD.craftingPistonGlue);
523
+		OreDictManager.INSTANCE.addReRegistration(OD.slimeball                      , OD.craftingPistonGlue);
524
+		OreDictManager.INSTANCE.addReRegistration(OD.slimeballPink                  , OD.craftingPistonGlue);
525
+		OreDictManager.INSTANCE.addReRegistration(OD.slimeballSwet                  , OD.craftingPistonGlue);
526
+		OreDictManager.INSTANCE.addReRegistration("ingotAnyIron"                    , OD.craftingPistonIngot);
527
+		OreDictManager.INSTANCE.addReRegistration("ingotAnySteel"                   , OD.craftingPistonIngot);
528
+		OreDictManager.INSTANCE.addReRegistration("ingotAnyBronze"                  , OD.craftingPistonIngot);
529
+		OreDictManager.INSTANCE.addReRegistration("ingotAlumite"                    , OD.craftingPistonIngot);
530
+		OreDictManager.INSTANCE.addReRegistration("ingotAluminium"                  , OD.craftingPistonIngot);
531
+		OreDictManager.INSTANCE.addReRegistration("ingotAluminiumAlloy"             , OD.craftingPistonIngot);
532
+		OreDictManager.INSTANCE.addReRegistration("ingotNickel"                     , OD.craftingPistonIngot);
533
+		OreDictManager.INSTANCE.addReRegistration("ingotInvar"                      , OD.craftingPistonIngot);
534
+		OreDictManager.INSTANCE.addReRegistration("ingotTitanium"                   , OD.craftingPistonIngot);
535
+		OreDictManager.INSTANCE.addReRegistration("ingotTungsten"                   , OD.craftingPistonIngot);
536
+		OreDictManager.INSTANCE.addReRegistration("ingotThaumium"                   , OD.craftingPistonIngot);
537
+		OreDictManager.INSTANCE.addReRegistration("ingotVoidMetal"                  , OD.craftingPistonIngot);
538
+		OreDictManager.INSTANCE.addReRegistration("ingotHSLASpringSteel"            , OD.craftingPistonIngot);
539
+		OreDictManager.INSTANCE.addReRegistration("ingotIronWood"                   , OD.craftingPistonIngot);
540
+		OreDictManager.INSTANCE.addReRegistration("ingotMagnalium"                  , OD.craftingPistonIngot);
541
+		OreDictManager.INSTANCE.addReRegistration("ingotUltimet"                    , OD.craftingPistonIngot);
542
+		OreDictManager.INSTANCE.addReRegistration("ingotManasteel"                  , OD.craftingPistonIngot);
543
+		OreDictManager.INSTANCE.addReRegistration("ingotTerrasteel"                 , OD.craftingPistonIngot);
544
+		OreDictManager.INSTANCE.addReRegistration("ingotElvorium"                   , OD.craftingPistonIngot);
545
+		OreDictManager.INSTANCE.addReRegistration("ingotMauftrium"                  , OD.craftingPistonIngot);
546
+		OreDictManager.INSTANCE.addReRegistration("ingotDuranium"                   , OD.craftingPistonIngot);
547
+		OreDictManager.INSTANCE.addReRegistration("ingotTritanium"                  , OD.craftingPistonIngot);
548
+		OreDictManager.INSTANCE.addReRegistration("ingotSyrmorite"                  , OD.craftingPistonIngot);
580 549
 		OreDictManager.INSTANCE.addReRegistration("stoneBowl"                       , "bowlStone");
581 550
 		OreDictManager.INSTANCE.addReRegistration("stoneRod"                        , "stickStone");
582 551
 		OreDictManager.INSTANCE.addReRegistration("budCannabis"                     , "cropCannabis");

+ 4
- 0
src/main/java/gregapi/load/LoaderUnificationTargets.java View File

@@ -39,6 +39,10 @@ public class LoaderUnificationTargets implements Runnable {
39 39
 	@Override
40 40
 	public void run() {
41 41
 		// Because most Mods (and vanilla MC) are not OreDict Compatible and need to be set as Target manually.
42
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Bone                   , ST.make(MD.Fossil, "fossil", 1, 0));
43
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Amber                  , ST.make(MD.Fossil, "amberOre", 1, 0));
44
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Amber                  , ST.make(MD.Fossil, "amber", 1, 0));
45
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.AmberDominican         , ST.make(MD.Fossil, "DominicanAmber", 1, 0));
42 46
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.Meteorite              , ST.make(MD.FM, "MeteoriteIngot", 1, 0));
43 47
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.FrozenIron             , ST.make(MD.FM, "FrozenIron", 1, 0));
44 48
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.Kreknorite             , ST.make(MD.FM, "KreknoriteIngot", 1, 0));

+ 9
- 1
src/main/java/gregapi/load/LoaderWoodDictionary.java View File

@@ -62,7 +62,7 @@ public class LoaderWoodDictionary implements Runnable {
62 62
 		PlankData.PLANKS[121] = ST.make(MD.ERE, "planks_scorched", 1, 0);
63 63
 		PlankData.PLANKS[122] = ST.make(MD.ERE, "planks_varnished", 1, 0);
64 64
 		PlankData.PLANKS[125] = IL.MaCu_Polished_Planks.get(1);
65
-		// No Gaps in this List, so 177 is next!
65
+		// No Gaps in this List, so 178 is next!
66 66
 		
67 67
 		
68 68
 		// Vanilla Trees
@@ -145,6 +145,10 @@ public class LoaderWoodDictionary implements Runnable {
145 145
 			if (MD.ATUM.mLoaded) {
146 146
 				new SaplingEntry(ST.make(MD.ATUM, "tile.palmSapling", 1, W), new WoodEntry(ST.make(MD.ATUM, "tile.palmLog", 1, W), WoodDictionary.BEAMS.get(BlocksGT.BeamB, 2), new PlankEntry(ST.make(MD.ATUM, "tile.palmPlanks", 1, W), 123)), ST.make(MD.ATUM, "tile.palmLeaves", 1, W));
147 147
 			}
148
+			// Fossils and Archeology
149
+			if (MD.Fossil.mLoaded) {
150
+				new SaplingEntry(ST.make(MD.Fossil, "palaeoraphneSapling", 1, W), new WoodEntry(ST.make(MD.Fossil, "palaeoraphneLog", 1, W), WoodDictionary.BEAMS.get(BlocksGT.BeamB, 2), new PlankEntry(ST.make(MD.Fossil, "palaeoraphnePlanks", 1, W), ST.make(MD.Fossil, "palaeoraphneSlab", 1, 0), ST.make(MD.Fossil, "palaeoraphneStairs", 1, 0), 177), 2, 500), ST.make(MD.Fossil, "palaeoraphneLeaves", 1, W));
151
+			}
148 152
 		} else {
149 153
 			WoodDictionary.DEFAULT_PLANK = WoodDictionary.PLANKS.get(Blocks.planks, 0);
150 154
 			
@@ -160,6 +164,10 @@ public class LoaderWoodDictionary implements Runnable {
160 164
 			if (MD.ATUM.mLoaded) {
161 165
 				new SaplingEntry(ST.make(MD.ATUM, "tile.palmSapling", 1, W), new WoodEntry(ST.make(MD.ATUM, "tile.palmLog", 1, W), new PlankEntry(ST.make(MD.ATUM, "tile.palmPlanks", 1, W), 123)), ST.make(MD.ATUM, "tile.palmLeaves", 1, W));
162 166
 			}
167
+			// Fossils and Archeology
168
+			if (MD.Fossil.mLoaded) {
169
+				new SaplingEntry(ST.make(MD.Fossil, "palaeoraphneSapling", 1, W), new WoodEntry(ST.make(MD.Fossil, "palaeoraphneLog", 1, W), new PlankEntry(ST.make(MD.Fossil, "palaeoraphnePlanks", 1, W), ST.make(MD.Fossil, "palaeoraphneSlab", 1, 0), ST.make(MD.Fossil, "palaeoraphneStairs", 1, 0), 177), 2, 500), ST.make(MD.Fossil, "palaeoraphneLeaves", 1, W));
170
+			}
163 171
 		}
164 172
 		// BambooModSakuraTrees
165 173
 		if (MD.Bamboo.mLoaded) {

+ 13
- 2
src/main/java/gregapi/oredict/OreDictMaterial.java View File

@@ -40,6 +40,7 @@ import gregapi.code.TagData;
40 40
 import gregapi.data.FL;
41 41
 import gregapi.data.MD;
42 42
 import gregapi.data.MT;
43
+import gregapi.data.OP;
43 44
 import gregapi.data.TC;
44 45
 import gregapi.data.TC.TC_AspectStack;
45 46
 import gregapi.data.TD;
@@ -1028,9 +1029,19 @@ public final class OreDictMaterial implements ITagDataContainer<OreDictMaterial>
1028 1029
 		return rFluid;
1029 1030
 	}
1030 1031
 	
1031
-	/** Sets the Plasma State of this Material. It is advised to have either 144 or 1000 as Fluid Amount. */
1032
+	/** Sets the Priority Prefix of this Material. The Material Amount of the Prefix has to be exactly 1 Unit or else it will be rejected. */
1032 1033
 	public OreDictMaterial setPriorityPrefix(OreDictPrefix aPrefix) {
1033
-		if (aPrefix.mAmount == U) mPriorityPrefix = aPrefix;
1034
+		if (aPrefix.mAmount == U) {
1035
+			mPriorityPrefix = aPrefix;
1036
+			
1037
+			if (mPriorityPrefix == OP.gem) {
1038
+				OreDictManager.INSTANCE.addReRegistrationWithReversal("block"+mNameInternal, "blockGem"+mNameInternal);
1039
+			} else if (mPriorityPrefix == OP.dust) {
1040
+				OreDictManager.INSTANCE.addReRegistrationWithReversal("block"+mNameInternal, "blockDust"+mNameInternal);
1041
+			} else if (mPriorityPrefix == OP.ingot) {
1042
+				OreDictManager.INSTANCE.addReRegistrationWithReversal("block"+mNameInternal, "blockIngot"+mNameInternal);
1043
+			}
1044
+		}
1034 1045
 		return this;
1035 1046
 	}
1036 1047
 	

+ 4
- 3
src/main/java/gregtech/items/behaviors/Behavior_Gun.java View File

@@ -75,11 +75,12 @@ public class Behavior_Gun extends AbstractBehaviorDefault {
75 75
 			
76 76
 			if (aBlock.getMaterial() == Material.water || aBlock.getMaterial() == Material.lava) {
77 77
 				return new MovingObjectPosition(aAX, aAY, aAZ, tSide, aPosA, T);
78
-			} else if (aBlock.getMaterial() == Material.glass) {
78
+			} else if (aBlock.getMaterial() == Material.glass || aBlock == Blocks.redstone_lamp || aBlock == Blocks.lit_redstone_lamp) {
79 79
 				if (aHitThings) {
80 80
 					OreDictItemData tData = OM.anydata(ST.make(aBlock, 1, aMeta));
81
-					for (OreDictMaterialStack tMaterial : tData.getAllMaterialStacks()) if (tMaterial.mAmount > OP.scrapGt.mAmount) {
82
-						ST.drop(aWorld, aAX+0.5, aAY+0.5, aAZ+0.5, aBlock, tMaterial.mAmount / OP.scrapGt.mAmount, aMeta);
81
+					for (OreDictMaterialStack tMaterial : tData.getAllMaterialStacks()) {
82
+						long tAmount = tMaterial.mAmount / OP.scrapGt.mAmount;
83
+						while (tAmount-->0) ST.drop(aWorld, aAX+0.2+RNGSUS.nextFloat()*0.6, aAY+0.1+RNGSUS.nextFloat()*0.5, aAZ+0.2+RNGSUS.nextFloat()*0.6, OP.scrapGt.mat(tMaterial.mMaterial, 1));
83 84
 					}
84 85
 				}
85 86
 			} else if (aBlock == Blocks.fence || aBlock == Blocks.fence_gate || aBlock == Blocks.web || aBlock == Blocks.mob_spawner || aBlock instanceof BlockPane || aBlock instanceof BlockRail || aBlock instanceof BlockTorch || aBlock instanceof BlockBaseBars || aBlock instanceof BlockBaseSpike || aBlock.getMaterial() == Material.cactus || aBlock.getMaterial() == Material.fire || aBlock.getMaterial() == Material.air || aBlock.getMaterial() == Material.carpet || aBlock.getMaterial() == Material.cloth || aBlock.getMaterial() == Material.leaves || aBlock.getMaterial() == Material.plants || aBlock.getMaterial() == Material.vine) {

+ 1
- 2
src/main/java/gregtech/loaders/a/Loader_Tools.java View File

@@ -60,7 +60,6 @@ import gregtech.items.tools.crafting.GT_Tool_File;
60 60
 import gregtech.items.tools.crafting.GT_Tool_RollingPin;
61 61
 import gregtech.items.tools.early.*;
62 62
 import gregtech.items.tools.electric.*;
63
-import gregtech.items.tools.guns.GT_Tool_Gun;
64 63
 import gregtech.items.tools.machine.*;
65 64
 import gregtech.items.tools.pocket.GT_Tool_Pocket_Chisel;
66 65
 import gregtech.items.tools.pocket.GT_Tool_Pocket_Cutter;
@@ -155,7 +154,7 @@ public class Loader_Tools implements Runnable {
155 154
 			ST.make(ToolsGT.sMetaTool, 1, ToolsGT.POCKET_MULTITOOL+((i+7)%8)*2)
156 155
 		);
157 156
 		
158
-		ToolsGT.sMetaTool.addTool(ToolsGT.PISTOL, "Pistol", "Single Shot, Moderate Damage", new GT_Tool_Gun().setMaterialAmount(U*3), TC.stack(TC.TELUM, 6), TC.stack(TC.FABRICO, 3), TC.stack(TC.IGNIS, 3));
157
+		// TODO: Guns, later: ToolsGT.sMetaTool.addTool(ToolsGT.PISTOL, "Pistol", "Single Shot, Moderate Damage", new GT_Tool_Gun().setMaterialAmount(U*3), TC.stack(TC.TELUM, 6), TC.stack(TC.FABRICO, 3), TC.stack(TC.IGNIS, 3));
159 158
 		
160 159
 		
161 160
 		

+ 1
- 1
src/main/java/gregtech/loaders/c/Loader_Recipes_Vanilla_OreDict.java View File

@@ -80,7 +80,7 @@ public class Loader_Recipes_Vanilla_OreDict extends OreDictListenerEvent_Names {
80 80
 			RM.Crusher      .addRecipe1(T, 16,  50, new long[] {10000, 1000}, aEvent.mStack, OP.dustImpure.mat(MT.Redrock, 1), OM.dust(MT.ClayBrown));
81 81
 		}});
82 82
 		addListener(OD.slimeball, new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
83
-			if (!OM.is(OD.slimeballSwet, aEvent.mStack) && !OM.is(OD.slimeballPink, aEvent.mStack) && !OM.is(OD.slimeballRice, aEvent.mStack)) {
83
+			if (!OM.is(OD.slimeballSwet, aEvent.mStack) && !OM.is(OD.slimeballPink, aEvent.mStack) && !OM.is(OD.slimeballRice, aEvent.mStack) && !OM.is(OD.itemTar, aEvent.mStack)) {
84 84
 			RM.Squeezer     .addRecipe1(T, 16,   64, aEvent.mStack, NF, FL.Slime_Green.make(250), ZL_IS);
85 85
 			RM.Juicer       .addRecipe1(T, 16,   64, aEvent.mStack, NF, FL.Slime_Green.make(125), ZL_IS);
86 86
 			RM.Centrifuge   .addRecipe1(T, 16,   64, aEvent.mStack, NF, FL.Latex.make(L/2), FL.Glue.make(250));

+ 4
- 0
src/main/java/gregtech/loaders/c/Loader_Recipes_Woods.java View File

@@ -84,6 +84,10 @@ public class Loader_Recipes_Woods implements Runnable {
84 84
 			RM.Bath.addRecipe1(T, 0, 16, IL.IE_Treated_Slab    .get(1), FL.Oil_Creosote.make(250), NF, IL.RC_Tie_Wood.get(1));
85 85
 			RM.Bath.addRecipe1(T, 0, 16, IL.Treated_Planks_Slab.get(1), FL.Oil_Creosote.make(250), NF, IL.RC_Tie_Wood.get(1));
86 86
 		}
87
+		if (IL.RC_Creosote_Wood.exists()) {
88
+			CR.shaped   (IL.Plank.get(NERFED_WOOD?4:5), CR.DEF_NAC_NCC, "s", "L", 'L', IL.RC_Creosote_Wood);
89
+			CR.shapeless(IL.Plank.get(NERFED_WOOD?2:4), CR.DEF_NAC_NCC, new Object[] {IL.RC_Creosote_Wood});
90
+		}
87 91
 		
88 92
 		for (WoodEntry aEntry : WoodDictionary.WOODS.values()) {
89 93
 			if (aEntry.mBeamEntry != null)

Loading…
Cancel
Save