A lot of stuff. Like, lots of stuff.

BuildCraftVersions.json

@@ -13,6 +13,6 @@
     },
     "1.8.9": {
         "7.2.0-pre6": "      Fix the builder and architect",
-        "7.2.0-pre12":"      Fix most things",
-    }
+        "7.2.0-pre12":"      Fix most things"
+	}
 }

buildcraft_resources/assets/buildcraftbuilders/blockstates/architect.json

@@ -0,0 +1,15 @@
+{
+	"forge_marker":1,
+	"defaults": {
+		"model": "buildcraftbuilders:architect"
+	},
+    "variants": {
+    	"facing": {
+    		"east": { "y":90 },
+    		"south": { "y":180 },
+    		"west": { "y":270 },
+    		"north": { "y":0 }
+    	},
+        "inventory": [{ "model": "buildcraftbuilders:architect" }]
+    }
+}

buildcraft_resources/assets/buildcraftbuilders/blockstates/library.json

@@ -0,0 +1,11 @@
+{
+	"forge_marker":1,
+    "variants": {
+		"facing": {    	
+        	"east":  { "model":"buildcraftbuilders:library" },
+        	"south":  { "model":"buildcraftbuilders:library", "y": 90 },
+        	"west":  { "model":"buildcraftbuilders:library", "y": 180 },
+        	"north":  { "model":"buildcraftbuilders:library", "y": 270 }
+    	}
+    }
+}

buildcraft_resources/assets/buildcraftbuilders/models/block/architect.json

@@ -0,0 +1,20 @@
+{
+    "parent": "block/cube",
+    "display": {
+    	"comment": "Taken from block/orientable",
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
+    "textures": {
+        "particle": "buildcraftbuilders:blocks/architect/back",
+        "down": "buildcraftbuilders:blocks/architect/bottom",
+        "up": "buildcraftbuilders:blocks/architect/top",
+        "north": "buildcraftbuilders:blocks/architect/front",
+        "east": "buildcraftbuilders:blocks/architect/left",
+        "south": "buildcraftbuilders:blocks/architect/back",
+        "west": "buildcraftbuilders:blocks/architect/right"
+    }
+}

buildcraft_resources/assets/buildcraftbuilders/models/block/buildToolBlock.json

@@ -1,5 +1,5 @@
 {
-	 "parent": "buildcraftcore:block/default_cube_all",
+	 "parent": "block/cube_all",
     "textures": {
     	"all": "buildcraftbuilders:blocks/builder/blockRemover"
     }

buildcraft_resources/assets/buildcraftbuilders/models/block/builder/main.json

@@ -1,5 +1,5 @@
 {
-	"parent":"buildcraftcore:block/default_cube",
+	"parent":"block/cube",
 	"textures":{
 		"particle":"buildcraftbuilders:blocks/builder/side",
 		"down":"buildcraftbuilders:blocks/builder/bottom",

buildcraft_resources/assets/buildcraftbuilders/models/block/filler/main.json

@@ -1,5 +1,5 @@
 {
-	"parent":"buildcraftcore:block/default_cube",
+	"parent":"block/cube",
 	"textures":{
 		"particle":"buildcraftbuilders:blocks/filler/side",
 		"down":"buildcraftbuilders:blocks/filler/bottom",

buildcraft_resources/assets/buildcraftbuilders/models/block/library.json

@@ -0,0 +1,20 @@
+{
+    "parent": "block/cube",
+    "display": {
+    	"comment": "Taken from block/orientable",
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
+    "textures": {
+        "particle": "buildcraftbuilders:blocks/library/back",
+        "down": "buildcraftbuilders:blocks/library/bottom",
+        "up": "buildcraftbuilders:blocks/library/top",
+        "north": "buildcraftbuilders:blocks/library/front",
+        "east": "buildcraftbuilders:blocks/library/left",
+        "south": "buildcraftbuilders:blocks/library/back",
+        "west": "buildcraftbuilders:blocks/library/right"
+    }
+}

buildcraft_resources/assets/buildcraftbuilders/models/block/quarry/main.json

@@ -1,5 +1,5 @@
 {
-	"parent":"buildcraftcore:block/default_cube",
+	"parent":"block/cube",
 	"textures":{
 		"particle":"buildcraftbuilders:blocks/quarry/side",
 		"down":"buildcraftbuilders:blocks/quarry/bottom",

buildcraft_resources/assets/buildcraftcore/guide/item/gear_wood.json

@@ -0,0 +1,9 @@
+{
+	"title": "Wooden Gear",
+	"customTypes": {
+		"mod": "BuildCraft",
+		"submod": "BC Core",
+		"era": "Wooden Era",
+		"type": "Gears"
+	}
+}

buildcraft_resources/assets/buildcraftcore/models/block/eternalSpring.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
         "all": "minecraft:blocks/bedrock"
     }

buildcraft_resources/assets/buildcraftcore/models/item/guide.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "items/book_writable"
+        "layer0": "buildcraftcore:items/guide_book"
     }
 }

buildcraft_resources/assets/buildcraftcore/models/item/map_location/path_repeating.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "buildcraftcore:items/map/path_repeating"
+    }
+}

buildcraft_resources/assets/buildcraftfactory/blockstates/autoworkbench_item.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "buildcraftfactory:autoworkbench_item" }
+    }
+}

buildcraft_resources/assets/buildcraftfactory/models/block/autoWorkbench.json → buildcraft_resources/assets/buildcraftfactory/models/block/autoworkbench_item.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
         "particle": "buildcraftfactory:blocks/autoWorkbench/side",
         "up": "buildcraftfactory:blocks/autoWorkbench/top",

buildcraft_resources/assets/buildcraftfactory/models/block/floodGate.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
 	"particle": "buildcraftfactory:blocks/floodGate/side",
         "up": "buildcraftfactory:blocks/floodGate/top",

buildcraft_resources/assets/buildcraftfactory/models/block/miningWell.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
 	"particle": "buildcraftfactory:blocks/mining_well/side",
         "up": "buildcraftfactory:blocks/mining_well/top",

buildcraft_resources/assets/buildcraftfactory/models/block/mining_well/main.json

@@ -1,5 +1,5 @@
 {
-	"parent":"buildcraftcore:block/default_cube",
+	"parent":"block/cube",
 	"textures":{
 		"particle":"buildcraftfactory:blocks/mining_well/side",
 		"down":"buildcraftfactory:blocks/mining_well/bottom",

buildcraft_resources/assets/buildcraftfactory/models/block/pump/main.json

@@ -1,5 +1,5 @@
 {
-	"parent":"buildcraftcore:block/default_cube",
+	"parent":"block/cube",
 	"textures":{
 		"particle":"buildcraftfactory:blocks/pump/side",
 		"down":"buildcraftfactory:blocks/pump/bottom",

buildcraft_resources/assets/buildcraftfactory/models/block/pump_done.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
 		"particle": "buildcraftfactory:blocks/pump/side_done",
         "up": "buildcraftfactory:blocks/pump/top",

buildcraft_resources/assets/buildcraftfactory/models/block/pump_off.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
 		"particle": "buildcraftfactory:blocks/pump/side_off",
         "up": "buildcraftfactory:blocks/pump/top",

buildcraft_resources/assets/buildcraftfactory/models/block/pump_on.json

@@ -1,5 +1,5 @@
 {
-    "parent": "buildcraftcore:block/default_cube_all",
+    "parent": "block/cube_all",
     "textures": {
 		"particle": "buildcraftfactory:blocks/pump/side_on",
         "up": "buildcraftfactory:blocks/pump/top",

buildcraft_resources/assets/buildcraftfactory/models/item/autoworkbench_item.json

@@ -0,0 +1,3 @@
+{
+    "parent": "buildcraftfactory:block/autoworkbench_item"
+}

buildcraft_resources/assets/buildcraftrobotics/models/block/requester.json

@@ -1,5 +1,5 @@
 {
-    "parent":"buildcraftcore:block/default_cube",
+    "parent":"block/cube",
     "textures": {
         "particle":"buildcraftrobotics:blocks/requester/side",
         "down":"buildcraftrobotics:blocks/requester/bottom",

common/buildcraft/builders/ItemBlueprint.java

@@ -24,7 +24,7 @@
 import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.utils.BCStringUtils;
 import buildcraft.core.lib.utils.ModelHelper;
-import buildcraft.core.lib.utils.NBTUtils;
+import buildcraft.lib.misc.NBTUtils;
 
 public abstract class ItemBlueprint extends ItemBuildCraft implements IBlueprintItem {
     public ItemBlueprint() {

common/buildcraft/builders/ItemConstructionMarker.java

@@ -18,8 +18,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class ItemConstructionMarker extends ItemBlock {
 

common/buildcraft/builders/LibraryBookTypeHandler.java

@@ -5,7 +5,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 
 import buildcraft.api.library.LibraryTypeHandlerNBT;
-import buildcraft.core.lib.utils.NBTUtils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class LibraryBookTypeHandler extends LibraryTypeHandlerNBT {
     public LibraryBookTypeHandler() {

common/buildcraft/builders/LibraryDatabase.java

@@ -22,7 +22,7 @@
 import buildcraft.api.core.BCLog;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.core.blueprints.LibraryId;
-import buildcraft.core.lib.utils.NBTUtils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class LibraryDatabase {
     protected Set<LibraryId> blueprintIds = new TreeSet<>();

common/buildcraft/builders/TileArchitect.java

@@ -35,9 +35,9 @@
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.ICommandReceiver;
 import buildcraft.core.lib.network.command.PacketCommand;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.NetworkUtils;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class TileArchitect extends TileBuildCraft implements IInventory, IBoxProvider, ICommandReceiver {
     public enum Mode {

common/buildcraft/builders/TileBlueprintLibrary.java

@@ -28,8 +28,8 @@
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.ICommandReceiver;
 import buildcraft.core.lib.network.command.PacketCommand;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.NetworkUtils;
+import buildcraft.lib.misc.NBTUtils;
 
 /** In this implementation, the blueprint library is the interface to the *local* player blueprint. The player will be
  * able to load blueprint on his environment, and save blueprints to the server environment. */

common/buildcraft/builders/TileBuilder.java

@@ -62,9 +62,9 @@
 import buildcraft.core.lib.network.base.Packet;
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.PacketCommand;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.NetworkUtils;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable, IInventoryListener {
 

common/buildcraft/builders/TileConstructionMarker.java

@@ -33,9 +33,9 @@
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.ICommandReceiver;
 import buildcraft.core.lib.network.command.PacketCommand;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.NetworkUtils;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class TileConstructionMarker extends TileBuildCraft implements IBuildingItemsProvider, IBoxProvider, ICommandReceiver {
 

common/buildcraft/builders/blueprints/RealBlueprintDeployer.java

@@ -18,8 +18,8 @@
 import buildcraft.core.blueprints.BptBuilderBlueprint;
 import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.blueprints.LibraryId;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.lib.misc.NBTUtils;
 
 public class RealBlueprintDeployer extends BlueprintDeployer {
     public static final RealBlueprintDeployer realInstance = new RealBlueprintDeployer();