Удалено цветное стекло

DDCompany · Mar 26, 2020 · cf558aa · cf558aa
1 parent f30b6e5
commit cf558aa
Show file tree

Hide file tree

Showing 36 changed files with 0 additions and 183 deletions.
diff --git a/dev/.includes b/dev/.includes
@@ -18,7 +18,6 @@ core/blocks/peat/peat.js
 core/blocks/peat/tile.js
 
 core/blocks/ores.js
-core/blocks/glass.js
 core/blocks/storage.js
 
 # ITEMS

diff --git a/dev/core/blocks/glass.js b/dev/core/blocks/glass.js
diff --git a/dev/factory/blocks/fabricator/recipes.js b/dev/factory/blocks/fabricator/recipes.js
@@ -1,15 +1,4 @@
 //Smelting
-for (let i = 0; i < 16; i++) {
-    FabricatorManager.addSmelting({
-        input: {
-            id: BlockID.forestryGlass,
-            data: i
-        },
-        amount: 1,
-        temperature: 1000
-    });
-}
-
 FabricatorManager.addSmelting({
     input: {
         id: 20
@@ -70,61 +59,6 @@ FabricatorManager.addSmelting({
 });
 
 //Recipes
-for (let i = 0; i < 16; i++) {
-    FabricatorManager.registerRecipe({
-        input: {3: {id: 351, data: i}, 6: {id: ItemID.propolis, data: 0}},
-        special: {
-            id: ItemID.waxCast,
-            data: 0,
-            count: 1,
-            dec: false
-        },
-        result: {
-            id: BlockID.forestryGlass,
-            count: 1,
-            data: i
-        }
-    });
-}
-
-if (ForestryConfig.glassEnabled) {
-    for (let i = 0; i < 16; i++) {
-        FabricatorManager.registerRecipe({
-            input: {3: {id: 351, data: i}, 6: {id: ItemID.propolisSilky, data: 0}},
-            special: {
-                id: ItemID.waxCast,
-                data: 0,
-                count: 1,
-                dec: false
-            },
-            result: {
-                id: BlockID.forestryGlass,
-                count: 1,
-                data: i
-            }
-        });
-
-    }
-
-    for (let i = 0; i < 16; i++) {
-        FabricatorManager.registerRecipe({
-            input: {3: {id: 351, data: i}, 6: {id: ItemID.propolisPulse, data: 0}},
-            special: {
-                id: ItemID.waxCast,
-                data: 0,
-                count: 1,
-                dec: false
-            },
-            result: {
-                id: BlockID.forestryGlass,
-                count: 1,
-                data: i
-            }
-        });
-
-    }
-}
-
 function registerTubeRecipe(itemId, materialId, materialData) {
     materialData = materialData || 0;
     FabricatorManager.registerRecipe({

diff --git a/dev/storage/items/backpacks.js b/dev/storage/items/backpacks.js
@@ -157,7 +157,6 @@ BackpackRegistry.register(ItemID.backpackBuilder, {
         "^glass.+",
         "^chest.+",
         "^block.+",
-        "^forestryGlass$",
         {
             id: 98,
             data: -1

diff --git a/res/terrain-atlas/glass/black/glass_black_0.png b/res/terrain-atlas/glass/black/glass_black_0.png
diff --git a/res/terrain-atlas/glass/black/glass_black_1.png b/res/terrain-atlas/glass/black/glass_black_1.png
diff --git a/res/terrain-atlas/glass/blue/glass_blue_0.png b/res/terrain-atlas/glass/blue/glass_blue_0.png
diff --git a/res/terrain-atlas/glass/blue/glass_blue_1.png b/res/terrain-atlas/glass/blue/glass_blue_1.png
diff --git a/res/terrain-atlas/glass/brown/glass_brown_0.png b/res/terrain-atlas/glass/brown/glass_brown_0.png
diff --git a/res/terrain-atlas/glass/brown/glass_brown_1.png b/res/terrain-atlas/glass/brown/glass_brown_1.png
diff --git a/res/terrain-atlas/glass/cyan/glass_cyan_0.png b/res/terrain-atlas/glass/cyan/glass_cyan_0.png
diff --git a/res/terrain-atlas/glass/cyan/glass_cyan_1.png b/res/terrain-atlas/glass/cyan/glass_cyan_1.png
diff --git a/res/terrain-atlas/glass/gray/glass_gray_0.png b/res/terrain-atlas/glass/gray/glass_gray_0.png
diff --git a/res/terrain-atlas/glass/gray/glass_gray_1.png b/res/terrain-atlas/glass/gray/glass_gray_1.png
diff --git a/res/terrain-atlas/glass/green/glass_green_0.png b/res/terrain-atlas/glass/green/glass_green_0.png
diff --git a/res/terrain-atlas/glass/green/glass_green_1.png b/res/terrain-atlas/glass/green/glass_green_1.png
diff --git a/res/terrain-atlas/glass/lightblue/glass_lightblue_0.png b/res/terrain-atlas/glass/lightblue/glass_lightblue_0.png
diff --git a/res/terrain-atlas/glass/lightblue/glass_lightblue_1.png b/res/terrain-atlas/glass/lightblue/glass_lightblue_1.png
diff --git a/res/terrain-atlas/glass/lightgray/glass_lightgray_0.png b/res/terrain-atlas/glass/lightgray/glass_lightgray_0.png
diff --git a/res/terrain-atlas/glass/lightgray/glass_lightgray_1.png b/res/terrain-atlas/glass/lightgray/glass_lightgray_1.png
diff --git a/res/terrain-atlas/glass/lime/glass_lime_0.png b/res/terrain-atlas/glass/lime/glass_lime_0.png
diff --git a/res/terrain-atlas/glass/lime/glass_lime_1.png b/res/terrain-atlas/glass/lime/glass_lime_1.png
diff --git a/res/terrain-atlas/glass/magenta/glass_magenta_0.png b/res/terrain-atlas/glass/magenta/glass_magenta_0.png
diff --git a/res/terrain-atlas/glass/magenta/glass_magenta_1.png b/res/terrain-atlas/glass/magenta/glass_magenta_1.png
diff --git a/res/terrain-atlas/glass/orange/glass_orange_0.png b/res/terrain-atlas/glass/orange/glass_orange_0.png
diff --git a/res/terrain-atlas/glass/orange/glass_orange_1.png b/res/terrain-atlas/glass/orange/glass_orange_1.png
diff --git a/res/terrain-atlas/glass/pink/glass_pink_0.png b/res/terrain-atlas/glass/pink/glass_pink_0.png
diff --git a/res/terrain-atlas/glass/pink/glass_pink_1.png b/res/terrain-atlas/glass/pink/glass_pink_1.png
diff --git a/res/terrain-atlas/glass/purple/glass_purple_0.png b/res/terrain-atlas/glass/purple/glass_purple_0.png
diff --git a/res/terrain-atlas/glass/purple/glass_purple_1.png b/res/terrain-atlas/glass/purple/glass_purple_1.png
diff --git a/res/terrain-atlas/glass/red/glass_red_0.png b/res/terrain-atlas/glass/red/glass_red_0.png
diff --git a/res/terrain-atlas/glass/red/glass_red_1.png b/res/terrain-atlas/glass/red/glass_red_1.png
diff --git a/res/terrain-atlas/glass/white/glass_white_0.png b/res/terrain-atlas/glass/white/glass_white_0.png
diff --git a/res/terrain-atlas/glass/white/glass_white_1.png b/res/terrain-atlas/glass/white/glass_white_1.png
diff --git a/res/terrain-atlas/glass/yellow/glass_yellow_0.png b/res/terrain-atlas/glass/yellow/glass_yellow_0.png
diff --git a/res/terrain-atlas/glass/yellow/glass_yellow_1.png b/res/terrain-atlas/glass/yellow/glass_yellow_1.png