diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d20981ae..432e3bd56 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,15 @@ ### 0.8.9 **Bugfixes** -- Fixed bug where Grid doesn't handle remainder sometimes +- Fixed bug where Grid crafting doesn't handle remainder sometimes - Fixed caching issues with External Storage +- Fixed possible crash with Disk Drives **Features** - Added a model for the Constructor - Added a model for the Destructor - Wireless Transmitters next to each other without any cable or without being connected to a machine won't work anymore, they need to be explictly connected to a cable or other machine -- Several models / texture tweaks +- Some models / texture tweaks ### 0.8.8 **Bugfixes** diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index ccfce356d..147bb6734 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -3,7 +3,9 @@ "defaults": { "textures": { "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/constructor", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index ccfce356d..b8f2b82f7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -3,7 +3,9 @@ "defaults": { "textures": { "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/destructor", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json index c41a535fc..ebf21ce0b 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -84,12 +84,12 @@ ], "faces": { "north": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -97,8 +97,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -106,8 +106,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -115,8 +115,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -124,8 +124,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -133,8 +133,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json index 41daa4c43..9f035e4b6 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json @@ -17,7 +17,7 @@ ], "faces": { "north": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -26,7 +26,7 @@ ] }, "east": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -35,7 +35,7 @@ ] }, "south": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -44,7 +44,7 @@ ] }, "west": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -53,7 +53,7 @@ ] }, "up": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -62,7 +62,7 @@ ] }, "down": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -86,57 +86,57 @@ ], "faces": { "north": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { - "texture": "#ine", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json index c4cdcbdf6..40b6af3cd 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json @@ -90,17 +90,17 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json index a2a496038..6d505f45e 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json @@ -86,12 +86,12 @@ ], "faces": { "north": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json index 50a8aecc0..3f803eb7f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,17 +99,17 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json index d29ae0f4b..0fcd3795d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,17 +117,17 @@ "uv": [ 0.0, 0.0, - 2.0, + 16.0, 10.0 ] }, "up": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json index b9aefd922..7efd3ab7b 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json @@ -80,7 +80,7 @@ 0.0 ], "to": [ - 2.0, + 0.0, 16.0, 16.0 ], @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,17 +108,17 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png index 1f97a5617..44719621a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png index 8595ea11e..21033289f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png old mode 100644 new mode 100755 index 5783d502f..a0c07decf Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png and b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png differ