From 96617a755eff7676de1d60e6eae37cdff34d3954 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 8 Feb 2015 22:54:12 -0800 Subject: [PATCH 01/11] First real version of item detail page * Split the InventoryTable view/controller out from the existing inventory view/controller. This is a simpler component which only includes the table itself, and not the scrollbox, panel or header used on the crafting page. * Create the FullRecipe view/controller to represent the expanded version of a recipe shown on the item page (as compared to the terser version on the crafting page). * Rename the existing Recipe view/controller to MinimalRecipe to avoid confusing the two. * Refactor the CSS for the Stack view/controller so that it can be shared between the Inventory and InventoryTable views. * Incorporate all these new controllers into the item page and hook up the necessary model logic to drive them. --- src/css/tags.scss | 8 +- src/css/templates/crafting_grid.scss | 2 +- src/css/templates/crafting_table.scss | 2 +- src/css/templates/full_recipe.scss | 39 ++++ src/css/templates/index.scss | 6 +- src/css/templates/inventory_table.scss | 74 +++++++ src/css/templates/item_page.scss | 12 +- .../{recipe.scss => minimal_recipe.scss} | 4 +- src/css/templates/stack.scss | 21 +- src/scripts/constants.coffee | 2 +- .../crafting_table_controller.coffee | 2 +- .../controllers/full_recipe_controller.coffee | 90 +++++++++ .../inventory_table_controller.coffee | 183 ++++++++++++++++++ .../controllers/item_page_controller.coffee | 50 +++-- .../controllers/stack_controller.coffee | 3 + src/scripts/models/item.coffee | 3 +- src/scripts/models/item_page.coffee | 33 ++-- src/templates/crafting_table.jade | 2 +- src/templates/full_recipe.jade | 20 ++ src/templates/inventory_table.jade | 16 ++ src/templates/item_page.jade | 6 +- src/templates/minimal_recipe.jade | 2 +- src/templates/stack.jade | 2 +- 23 files changed, 528 insertions(+), 54 deletions(-) create mode 100644 src/css/templates/full_recipe.scss create mode 100644 src/css/templates/inventory_table.scss rename src/css/templates/{recipe.scss => minimal_recipe.scss} (95%) create mode 100644 src/scripts/controllers/full_recipe_controller.coffee create mode 100644 src/scripts/controllers/inventory_table_controller.coffee create mode 100644 src/templates/full_recipe.jade create mode 100644 src/templates/inventory_table.jade diff --git a/src/css/tags.scss b/src/css/tags.scss index d986fbbcb..766a957f9 100644 --- a/src/css/tags.scss +++ b/src/css/tags.scss @@ -65,10 +65,12 @@ h2 { } h3 { - font-family: $font-family-normal; - font-weight: bold; + margin-bottom: 0.5em; - p { font-size: $font-size-normal; } + p { + font-family: $font-family-header; + font-size: $font-size-normal; + } } p { diff --git a/src/css/templates/crafting_grid.scss b/src/css/templates/crafting_grid.scss index c4f0b5289..a1889e841 100644 --- a/src/css/templates/crafting_grid.scss +++ b/src/css/templates/crafting_grid.scss @@ -18,4 +18,4 @@ All rights reserved. border: 0.1em solid $color-gray-light; padding: 0.1em; } -} \ No newline at end of file +} diff --git a/src/css/templates/crafting_table.scss b/src/css/templates/crafting_table.scss index 81b35558d..73de2431f 100644 --- a/src/css/templates/crafting_table.scss +++ b/src/css/templates/crafting_table.scss @@ -26,7 +26,7 @@ All rights reserved. } } - .view__recipe { + .view__minimal_recipe { position: absolute; top: 50%; left: 50%; @include transform(translate(-50%, -50%)); } diff --git a/src/css/templates/full_recipe.scss b/src/css/templates/full_recipe.scss new file mode 100644 index 000000000..4e909c65d --- /dev/null +++ b/src/css/templates/full_recipe.scss @@ -0,0 +1,39 @@ +/* +Crafting Table - full_recipe.scss + +Copyright (c) 2014-2015 by Redwood Labs +All rights reserved. +*/ + +.view__full_recipe { + & > div { + position: relative; width: 33%; + display: inline-block; + vertical-align: top; + } + + .pattern { + .view__crafting_grid { + position: relative; left: 50%; + @include transform(translateX(-50%)); + } + + .tool { + margin-top: 0.5em; + text-align: center; + + p { + font-weight: bold; + } + } + } + + .input { + .view__inventory { + width: 100%; + } + } + + .output { + } +} diff --git a/src/css/templates/index.scss b/src/css/templates/index.scss index be4632821..e4a5b1143 100644 --- a/src/css/templates/index.scss +++ b/src/css/templates/index.scss @@ -6,14 +6,16 @@ All rights reserved. */ @import 'crafting_grid'; +@import 'crafting_page'; @import 'crafting_table'; @import 'feedback'; +@import 'full_recipe'; @import 'inventory'; +@import 'inventory_table'; @import 'item'; @import 'item_page'; -@import 'crafting_page'; +@import 'minimal_recipe'; @import 'mod'; @import 'mod_pack'; @import 'mod_page'; -@import 'recipe'; @import 'stack'; diff --git a/src/css/templates/inventory_table.scss b/src/css/templates/inventory_table.scss new file mode 100644 index 000000000..d702d72f8 --- /dev/null +++ b/src/css/templates/inventory_table.scss @@ -0,0 +1,74 @@ +/* +Crafting Guide - inventory_table.scss + +Copyright (c) 2014-2015 by Redwood Labs +All rights reserved. +*/ + +.view__inventory_table { + table { + width: 100%; + + td { + height: 2.4em; + vertical-align: middle; + } + + td.quantity { + position: relative; + width: 2.4em; + + input { + position: absolute; top: 50%; height: $font-size-small; width: 100%; + @include transform(translateY(-50%)); + border-radius: 0.75em; + margin: 0 auto; + text-align: center; + max-width: 2.8em; + } + } + + td.name { + text-align: left; + padding-right: 1em; + + input { + width: 100%; + border: 0; + border-bottom: 1px dashed $color-gray-light; + outline: 0; + + &:focus { + border: 1px solid $color-gray-light; + } + } + } + + td.action { + width: 4em; + } + + .edit td { + padding-top: 1em; + } + } + + .toolbar { + position: relative; width: 100%; + background: $color-background-toolbar; + border-top: 1px solid $color-gray-light; + } + + button:disabled { + background: white; + color: $color-gray-light; + } + + button[name="clear"] { + position: absolute; bottom: 0.5em; right: 0.5em; + } + + input { + border: 1px solid $color-gray-light; + } +} diff --git a/src/css/templates/item_page.scss b/src/css/templates/item_page.scss index 6eaa33ccd..a971354c0 100644 --- a/src/css/templates/item_page.scss +++ b/src/css/templates/item_page.scss @@ -31,7 +31,7 @@ All rights reserved. padding: 1em; padding-top: 2em; - .name { + h1.name { font-family: $font-family-header; font-size: $font-size-x-large; margin: 0; @@ -57,12 +57,20 @@ All rights reserved. } } - .usedInMaking { + .recipe { display: none; + + .view__full_recipe { + width: 100%; + } } .similar { display: none; } + + .usedInMaking { + display: none; + } } } diff --git a/src/css/templates/recipe.scss b/src/css/templates/minimal_recipe.scss similarity index 95% rename from src/css/templates/recipe.scss rename to src/css/templates/minimal_recipe.scss index 65b28d132..7a31dac6d 100644 --- a/src/css/templates/recipe.scss +++ b/src/css/templates/minimal_recipe.scss @@ -1,11 +1,11 @@ /* -Crafting Table - recipe.scss +Crafting Table - minimal_recipe.scss Copyright (c) 2014-2015 by Redwood Labs All rights reserved. */ -.view__recipe { +.view__minimal_recipe { position: relative; height: 20em; width: 26em; .input { diff --git a/src/css/templates/stack.scss b/src/css/templates/stack.scss index 2e729e557..5f7ce9042 100644 --- a/src/css/templates/stack.scss +++ b/src/css/templates/stack.scss @@ -8,7 +8,11 @@ All rights reserved. .view__stack { font-family: $font-family-normal; - .quantity p { + td { + padding: 0.2em 0; + } + + td.quantity p { border-radius: 0.75em; background: $color-ice; color: $color-background-panel; @@ -19,12 +23,23 @@ All rights reserved. padding: 0.1em 0.5em; } - .name p { + td.icon { + width: 4.6em; + padding: 0.2em 0.5em; + + img { + width: 100%; height: auto; + max-height: 4.8em; + @include pixel-image; + } + } + + td.name p { display: inline; font-size: $font-size-normal; } - .action { + td.action { text-align: right; button.remove { diff --git a/src/scripts/constants.coffee b/src/scripts/constants.coffee index 5e6f3f1b3..074728e71 100644 --- a/src/scripts/constants.coffee +++ b/src/scripts/constants.coffee @@ -16,7 +16,7 @@ exports.DefaultMods = [ ] exports.Duration = Duration = {} -Duration.snap = 100 +Duration.snap = 200 Duration.fast = Duration.snap * 2 Duration.normal = Duration.fast * 2 Duration.slow = Duration.normal * 2 diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee index b82518db4..91845a908 100644 --- a/src/scripts/controllers/crafting_table_controller.coffee +++ b/src/scripts/controllers/crafting_table_controller.coffee @@ -44,7 +44,7 @@ module.exports = class CraftingTableController extends BaseController # BaseController Overrides ##################################################################### onDidRender: -> - @recipeController = @addChild MinimalRecipeController, '.view__recipe', imageLoader:@_imageLoader, modPack:@_modPack + @recipeController = @addChild MinimalRecipeController, '.view__minimal_recipe', imageLoader:@_imageLoader, modPack:@_modPack @$next = @$('.next') @$prev = @$('.prev') diff --git a/src/scripts/controllers/full_recipe_controller.coffee b/src/scripts/controllers/full_recipe_controller.coffee new file mode 100644 index 000000000..ed6b0b38e --- /dev/null +++ b/src/scripts/controllers/full_recipe_controller.coffee @@ -0,0 +1,90 @@ +### +Crafting Guide - full_recipe_controller.coffee + +Copyright (c) 2015 by Redwood Labs +All rights reserved. +### + +BaseController = require './base_controller' +CraftingGridController = require './crafting_grid_controller' +{Duration} = require '../constants' +ImageLoader = require './image_loader' +Inventory = require '../models/inventory' +InventoryTableController = require './inventory_table_controller' + +######################################################################################################################## + +module.exports = class FullRecipeController extends BaseController + + constructor: (options={})-> + if not options.modPack? then throw new Error 'options.modPack is required' + options.imageLoader ?= new ImageLoader defaultUrl:'/images/unknown.png' + options.templateName = 'full_recipe' + super options + + @_imageLoader = options.imageLoader + @modPack = options.modPack + + # BaseController Overrides ##################################################################### + + onDidRender: -> + @gridController = @addChild CraftingGridController, '.view__crafting_grid', + modPack: @modPack + imageLoader: @_imageLoader + + @inputController = @addChild InventoryTableController, '.input .view__inventory_table', + editable: false + model: new Inventory + modPack: @modPack + + @outputController = @addChild InventoryTableController, '.output .view__inventory_table', + editable: false + model: new Inventory + modPack: @modPack + + @$tool = @$('.tool p') + super + + refresh: -> + @gridController.model = @model + @$tool.html @_findToolNames().join ', ' + + @$el.tooltip show:{delay:Duration.fast, duration:Duration.fast} + + @_refreshInputs() + @_refreshOutputs() + + super + + # Backbone.View Methods ######################################################################## + + events: -> + return _.extend super, + 'click a': 'routeLinkClick' + + # Private Methods ############################################################################## + + _findToolNames: -> + result = [] + if @model? + for stack in @model.tools + name = @modPack.findName stack.slug + result.push name if name? + return result + + _refreshInputs: -> + inputs = @inputController.model + inputs.clear() + + if @model? + for stack in @model.input + inputs.add stack.slug, stack.quantity + + + _refreshOutputs: -> + outputs = @outputController.model + outputs.clear() + + if @model? + for stack in @model.output + outputs.add stack.slug, stack.quantity diff --git a/src/scripts/controllers/inventory_table_controller.coffee b/src/scripts/controllers/inventory_table_controller.coffee new file mode 100644 index 000000000..6abddb72e --- /dev/null +++ b/src/scripts/controllers/inventory_table_controller.coffee @@ -0,0 +1,183 @@ +### +Crafting Guide - inventory_table_controller.coffee + +Copyright (c) 2014-2015 by Redwood Labs +All rights reserved. +### + +BaseController = require './base_controller' +{Duration} = require '../constants' +{Key} = require '../constants' +ImageLoader = require './image_loader' +NameFinder = require '../models/name_finder' +StackController = require './stack_controller' + +######################################################################################################################## + +module.exports = class InventoryTableController extends BaseController + + @ONLY_DIGITS = /^[0-9]*$/ + + constructor: (options={})-> + if not options.model? then throw new Error 'options.model is required' + if not options.modPack? then throw new Error 'options.modPack is required' + + @editable = options.editable ?= true + @imageLoader = options.imageLoader ?= new ImageLoader defaultUrl:'/images/unknown.png' + @modPack = options.modPack + @nameFinder = options.nameFinder ?= new NameFinder options.modPack + @onChange = options.onChange ?= -> # do nothing + + options.templateName = 'inventory_table' + super options + + @_stackControllers = [] + + @listenTo @modPack, 'change', => @refresh() + + # Event Methods ################################################################################ + + onAddButtonClicked: -> + name = @$nameField.val() + return unless @modPack.isValidName name + + @model.add _.slugify(name), parseInt(@$quantityField.val()) + @$nameField.val '' + @$quantityField.val '1' + + @$scrollbox.scrollTop @$scrollbox.prop 'scrollHeight' + @$nameField.autocomplete 'close' + + @onChange() + + onClearButtonClicked: -> + @model.clear() + @onChange() + + onItemSelected: -> + func = => + @onNameFieldChanged() + @onAddButtonClicked() + @$nameField.blur() + + setTimeout func, 10 # needed to allow the autocomplete to finish + return true + + onNameFieldBlur: -> + item = @modPack.findItemByName @$nameField.val() + @$nameField.val if item? then item.name else '' + @onNameFieldChanged() + + onNameFieldChanged: -> + item = @modPack.findItemByName @$nameField.val() + @_updateButtonState() + + onNameFieldFocused: -> + @$nameField.val '' + @$nameField.autocomplete('search') + + onNameFieldKeyUp: (event)-> + if event.which is Key.Return + @onAddButtonClicked() + + onQuantityFieldBlur: -> + value = @$quantityField.val().replace /[^0-9]/g, '' + if value.length is 0 then value = '1' + value = Math.min value, 64 + @$quantityField.val value + @onQuantityFieldChanged() + + onQuantityFieldChanged: -> + if not @$quantityField.val().match /^[0-9]*$/ + @$quantityField.addClass 'error', 0 + @$quantityField.addClass 'error-new', 0 + @$quantityField.removeClass 'error-new', Duration.slow + @$quantityField.focus() + return + + @$quantityField.removeClass 'error', Duration.fast + @$quantityField.removeClass 'error-new', Duration.fast + @_updateButtonState() + + onQuantityFieldFocused: -> + @$quantityField.val '' + + # BaseController Overrides ##################################################################### + + onDidRender: -> + @$addButton = @$('button[name="add"]') + @$clearButton = @$('button[name="clear"]') + @$editPanel = @$('.edit') + @$nameField = @$('input[name="name"]') + @$quantityField = @$('input[name="quantity"]') + @$scrollbox = @$('.scrollbox') + @$table = @$('table') + @$toolbar = @$('.toolbar') + super + + refresh: -> + @$editPanel.css display:(if @editable then 'table-row' else 'none') + @$toolbar.css display:(if @editable then 'block' else 'none') + @$scrollbox.css bottom:(if @editable then @$toolbar.height() else '0') + + if _.isEmpty(@$quantityField.val()) then @$quantityField.val '1' + + @$table.find('tr:not(:last-child)').remove() + $lastRow = @$table.find 'tr:last-child' + @_stackControllers = [] + @model.each (stack)=> + options = + editable: @editable + imageLoader: @imageLoader + model: stack + modPack: @modPack + onRemove: if not @editable then null else (stack)=> @_removeStack(stack) + + controller = new StackController options + controller.render() + controller.$el.insertBefore $lastRow + @_stackControllers.push controller + + @_updateNameAutocomplete() + @_updateButtonState() + + super + + # Backbone.View Overrides ###################################################################### + + events: -> + return _.extend super, + 'blur input[name="name"]': 'onNameFieldBlur' + 'blur input[name="quantity"]': 'onQuantityFieldBlur' + 'click button[name="add"]': 'onAddButtonClicked' + 'click button[name="clear"]': 'onClearButtonClicked' + 'focus input[name="name"]': 'onNameFieldFocused' + 'focus input[name="quantity"]': 'onQuantityFieldFocused' + 'input input[name="name"]': 'onNameFieldChanged' + 'input input[name="quantity"]': 'onQuantityFieldChanged' + 'keyup input[name="name"]': 'onNameFieldKeyUp' + + # Private Methods ############################################################################## + + _removeStack: (stack)-> + @model.remove stack.slug, stack.quantity + + _updateNameAutocomplete: -> + onChanged = => @onNameFieldChanged() + onSelected = => @onItemSelected() + + @$nameField.autocomplete + source: (request, callback)=> callback @nameFinder.search request.term + delay: 0 + minLength: 0 + change: onChanged + close: onChanged + select: onSelected + + _updateButtonState: -> + if @model.isEmpty then @$clearButton.attr('disabled', 'disabled') else @$clearButton.removeAttr('disabled') + + itemValid = @modPack.findItemByName(@$nameField.val())? + quantityValid = @$quantityField.val().match(InventoryTableController.ONLY_DIGITS) + disable = not (itemValid and quantityValid) + if disable then @$addButton.attr('disabled', 'disabled') else @$addButton.removeAttr('disabled') diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index 77d82c013..2f1f9c318 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -5,14 +5,15 @@ Copyright (c) 2015 by Redwood Labs All rights reserved. ### -BaseController = require './base_controller' -{Duration} = require '../constants' -{Event} = require '../constants' -ImageLoader = require './image_loader' -Item = require '../models/item' -ItemGroupController = require './item_group_controller' -ItemPage = require '../models/item_page' -{Url} = require '../constants' +BaseController = require './base_controller' +{Duration} = require '../constants' +{Event} = require '../constants' +FullRecipeController = require './full_recipe_controller' +ImageLoader = require './image_loader' +Item = require '../models/item' +ItemGroupController = require './item_group_controller' +ItemPage = require '../models/item_page' +{Url} = require '../constants' ######################################################################################################################## @@ -32,25 +33,27 @@ module.exports = class ItemPageController extends BaseController @_itemSlug = options.itemSlug @_modPack = options.modPack - @_modPack.on Event.change, => @_resolveItemSlug() - @_resolveItemSlug() + @_modPack.on Event.change, => @refresh() # BaseController Overrides ##################################################################### onDidRender: -> + @_recipeController = @addChild FullRecipeController, '.view__full_recipe', modPack:@_modPack @_similarItemsController = @addChild ItemGroupController, '.similar .view__item_group', modPack:@_modPack - @_usedInMakingController = @addChild ItemGroupController, '.usedInMaking .view__item_group', modPack:@_modPack + @_usedInMakingController = @addChild ItemGroupController, '.usedInMaking .view__item_group', modPack:@_modPack - @$byline = @$('.byline') - @$bylineLink = @$('.byline a') + @$byline = @$('.byline') + @$bylineLink = @$('.byline a') @$usedInMakingContainer = @$('.usedInMaking') - @$name = @$('h1.name') - @$recipeContainer = @$('.recipe') - @$similarContainer = @$('.similar') - @$titleImage = @$('.titleImage img') + @$name = @$('h1.name') + @$recipeContainer = @$('.recipe') + @$similarContainer = @$('.similar') + @$titleImage = @$('.titleImage img') super refresh: -> + @_resolveItemSlug() + display = @_modPack.findItemDisplay @model.item?.slug if display? @_imageLoader.load display.iconUrl, @$titleImage @@ -60,6 +63,7 @@ module.exports = class ItemPageController extends BaseController @$name.html '' @_refreshByline() + @_refreshRecipe() @_refreshSimilarItems() @_refreshComponentIn() @@ -77,7 +81,7 @@ module.exports = class ItemPageController extends BaseController @$byline.fadeOut duration:Duration.fast _refreshComponentIn: -> - @_usedInMakingController.title = 'Used in Making' + @_usedInMakingController.title = 'Used to Make' @_usedInMakingController.model = @model.findComponentInItems() if @_usedInMakingController.model? @@ -85,6 +89,13 @@ module.exports = class ItemPageController extends BaseController else @$usedInMakingContainer.fadeOut duration:Duration.fast + _refreshRecipe: -> + @_recipeController.model = @model.primaryRecipe + if @_recipeController.model? + @$recipeContainer.fadeIn duration:Duration.fast + else + @$recipeContainer.fadeOut duration:Duration.fast + _refreshSimilarItems: -> group = @model.item?.group if group? and group isnt Item.Group.Other @@ -99,5 +110,6 @@ module.exports = class ItemPageController extends BaseController @$similarContainer.fadeOut duration:Duration.fast _resolveItemSlug: -> + oldItem = @model.item @model.item = @_modPack.findItem @_itemSlug, includeDisabled:true - + newItem = @model.item diff --git a/src/scripts/controllers/stack_controller.coffee b/src/scripts/controllers/stack_controller.coffee index 57ad2d392..118c33345 100644 --- a/src/scripts/controllers/stack_controller.coffee +++ b/src/scripts/controllers/stack_controller.coffee @@ -35,6 +35,7 @@ module.exports = class StackController extends BaseController # BaseController Overrides ##################################################################### onDidRender: -> + @$action = @$('.action') @$image = @$('.icon img') @$nameField = @$('.name p') @$quantityField = @$('.quantity p') @@ -49,6 +50,8 @@ module.exports = class StackController extends BaseController @$quantityField.html @model.quantity @$removeButton.css display:(if @editable then 'inherit' else 'none') + @$action.css display:(if @ediable then 'table-cell' else 'none') + super # Backbone.View Overrides ###################################################################### diff --git a/src/scripts/models/item.coffee b/src/scripts/models/item.coffee index 5e33a9dbe..9cb620969 100644 --- a/src/scripts/models/item.coffee +++ b/src/scripts/models/item.coffee @@ -27,7 +27,8 @@ module.exports = class Item extends BaseModel @_recipes = [] Object.defineProperties this, - 'isCraftable': { get:-> @_recipes.length > 0 } + isCraftable: { get:-> @_recipes.length > 0 } + primaryRecipe: { get:@getPrimaryRecipe } # Public Methods ############################################################################### diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee index 250fcd4f7..12e63c1f0 100644 --- a/src/scripts/models/item_page.coffee +++ b/src/scripts/models/item_page.coffee @@ -7,7 +7,7 @@ All rights reserved. BaseModel = require './base_model' CraftingPlan = require './crafting_plan' -Event = require '../constants' +{Event} = require '../constants' ######################################################################################################################## @@ -25,21 +25,10 @@ module.exports = class ItemPage extends BaseModel Object.defineProperties this, craftingRawMaterials: {get:-> @_plan.need} craftingSteps: {get:-> @_plan.steps} - similarItems: {get:=> @getSimilarItems()} + primaryRecipe: {get:-> @_primaryRecipe} # Property Methods ############################################################################# - findSimilarItems: -> - return null unless @item?.modVersion? - - result = [] - @item.modVersion.eachItemInGroup @item.group, (item)=> - return if item is @item - result.push item - - return null unless result.length > 0 - return result - findComponentInItems: -> return null unless @item? @@ -56,6 +45,17 @@ module.exports = class ItemPage extends BaseModel return null unless result.length > 0 return result + findSimilarItems: -> + return null unless @item?.modVersion? + + result = [] + @item.modVersion.eachItemInGroup @item.group, (item)=> + return if item is @item + result.push item + + return null unless result.length > 0 + return result + # Private Methods ############################################################################## _updateCraftingPlan: -> @@ -63,4 +63,9 @@ module.exports = class ItemPage extends BaseModel if @item? @_plan.want.add @item.slug - @_plan.craft() \ No newline at end of file + @_plan.craft() + + if @_plan.steps.length > 0 + @_primaryRecipe = @_plan.steps[@_plan.steps.length - 1].recipe + else + @_primaryRecipe = null diff --git a/src/templates/crafting_table.jade b/src/templates/crafting_table.jade index 3a1a74102..0f517f8c2 100644 --- a/src/templates/crafting_table.jade +++ b/src/templates/crafting_table.jade @@ -12,7 +12,7 @@ .panel .prev - .view__recipe + .view__minimal_recipe .next .problem diff --git a/src/templates/full_recipe.jade b/src/templates/full_recipe.jade new file mode 100644 index 000000000..780c4c2fa --- /dev/null +++ b/src/templates/full_recipe.jade @@ -0,0 +1,20 @@ +//- +//- Crafting Guide - full_recipe.jade +//- +//- Copyright (c) 2015 by Redwood Labs +//- All rights reserved. +//- + +.view__full_recipe + + .input + h3: p Ingredients + .view__inventory_table + + .pattern + table.view__crafting_grid + .tool: p + + .output + h3: p Produces + .view__inventory_table diff --git a/src/templates/inventory_table.jade b/src/templates/inventory_table.jade new file mode 100644 index 000000000..e4753d6c6 --- /dev/null +++ b/src/templates/inventory_table.jade @@ -0,0 +1,16 @@ +//- +//- Crafting Guide - inventory_table.jade +//- +//- Copyright (c) 2014-2015 by Redwood Labs +//- All rights reserved. +//- + +.view__inventory_table + table + tr.edit + td.quantity: input(name="quantity") + td.icon: img(src="/images/unknown.png") + td.name(width="*"): input(name="name") + td.action: button(name="add") add + .toolbar + button(name="clear") clear diff --git a/src/templates/item_page.jade b/src/templates/item_page.jade index 8cee7252f..b55b68e1d 100644 --- a/src/templates/item_page.jade +++ b/src/templates/item_page.jade @@ -14,7 +14,11 @@ .byline: p from .description: p - .recipe + .recipe.section + h2 Recipe + .panel + .view__full_recipe + .usedInMaking: .view__item_group .similar: .view__item_group .plan \ No newline at end of file diff --git a/src/templates/minimal_recipe.jade b/src/templates/minimal_recipe.jade index 6355b8b6c..751191308 100644 --- a/src/templates/minimal_recipe.jade +++ b/src/templates/minimal_recipe.jade @@ -5,7 +5,7 @@ //- All rights reserved. //- -.view__recipe +.view__minimal_recipe .input table.view__crafting_grid .tool: p diff --git a/src/templates/stack.jade b/src/templates/stack.jade index 1adffb769..594b2c1bd 100644 --- a/src/templates/stack.jade +++ b/src/templates/stack.jade @@ -8,6 +8,6 @@ tr.view__stack td.quantity: p td.icon: img(src='') - td.name: p + td.name(width='*'): p td.action button.remove   From 289d925da8f496590f7bf5f59d8f22ad1adc16f3 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 14:28:21 -0800 Subject: [PATCH 02/11] Show all recipes for an item on its detail page --- src/css/templates/full_recipe.scss | 2 + src/css/templates/item_page.scss | 7 +++- src/marketing/forum-posts.txt | 19 +++++++++- .../controllers/item_page_controller.coffee | 38 ++++++++++++++----- src/scripts/models/item_page.coffee | 6 ++- src/templates/item_page.jade | 5 +-- 6 files changed, 62 insertions(+), 15 deletions(-) diff --git a/src/css/templates/full_recipe.scss b/src/css/templates/full_recipe.scss index 4e909c65d..1a0f523f5 100644 --- a/src/css/templates/full_recipe.scss +++ b/src/css/templates/full_recipe.scss @@ -6,6 +6,8 @@ All rights reserved. */ .view__full_recipe { + display: block; + & > div { position: relative; width: 33%; display: inline-block; diff --git a/src/css/templates/item_page.scss b/src/css/templates/item_page.scss index a971354c0..b4b4e967c 100644 --- a/src/css/templates/item_page.scss +++ b/src/css/templates/item_page.scss @@ -57,11 +57,16 @@ All rights reserved. } } - .recipe { + .recipes { display: none; .view__full_recipe { width: 100%; + margin-top: 3em; + + &:first-child { + margin-top: 0; + } } } diff --git a/src/marketing/forum-posts.txt b/src/marketing/forum-posts.txt index f2c20e80e..6bad1b163 100644 --- a/src/marketing/forum-posts.txt +++ b/src/marketing/forum-posts.txt @@ -46,4 +46,21 @@ also updated the site to let you select the version you're using. I just pushed up a big new feature! Now, each Mod has a dedicated page of its own which lists all the items available in that mod. Clicking on an item will take you to the crafting guide for that item. It's super fast to switch back and forth to explore the items in any given mod. This is the first of many steps for the new mod pages, so keep an eye out -for more to come! \ No newline at end of file +for more to come! + +######################################################################################################################## + + +I've been working on a project to make it easier to deal with complex recipes, and I recently finished adding all the +core Minecraft recipes. The gist of the site is that you tell it what item(s) you want to make, and it will figure out +all the raw ingredients you need along with step-by-step instructions for any number of whatever items you like. For +example, [http://crafting-guide.com/crafting/16.potion_of_fire_resistance_8_00:16.potion_of_healing_ii here's how you +make] 16 potions of healing II and fire resistance (with extended duration). + +The maintainers of many of the mods I've added (e.g., BuildCraft / Applied Energistics) have found it useful to include +links to Crafting Guide in their official documentation, and I was hoping you would think it a good idea to add links +from this wiki to CraftingGuide as well. I'd be happy to do the work of adding the links myself, but I'd like to make +sure there are no objections first! + +Thanks! +~~~~ \ No newline at end of file diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index 2f1f9c318..33344a766 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -38,17 +38,17 @@ module.exports = class ItemPageController extends BaseController # BaseController Overrides ##################################################################### onDidRender: -> - @_recipeController = @addChild FullRecipeController, '.view__full_recipe', modPack:@_modPack @_similarItemsController = @addChild ItemGroupController, '.similar .view__item_group', modPack:@_modPack @_usedInMakingController = @addChild ItemGroupController, '.usedInMaking .view__item_group', modPack:@_modPack @$byline = @$('.byline') @$bylineLink = @$('.byline a') - @$usedInMakingContainer = @$('.usedInMaking') @$name = @$('h1.name') - @$recipeContainer = @$('.recipe') + @$recipeContainer = @$('.recipes .panel') + @$recipesSection = @$('.recipes') @$similarContainer = @$('.similar') @$titleImage = @$('.titleImage img') + @$usedInMakingContainer = @$('.usedInMaking') super refresh: -> @@ -63,7 +63,7 @@ module.exports = class ItemPageController extends BaseController @$name.html '' @_refreshByline() - @_refreshRecipe() + @_refreshRecipes() @_refreshSimilarItems() @_refreshComponentIn() @@ -89,12 +89,32 @@ module.exports = class ItemPageController extends BaseController else @$usedInMakingContainer.fadeOut duration:Duration.fast - _refreshRecipe: -> - @_recipeController.model = @model.primaryRecipe - if @_recipeController.model? - @$recipeContainer.fadeIn duration:Duration.fast + _refreshRecipes: -> + @_recipeControllers ?= [] + index = 0 + + recipes = @model.findRecipes() + if recipes? + @$recipesSection.fadeIn duration:Duration.normal + + for recipe in @model.findRecipes() + controller = @_recipeControllers[index] + if not controller? + controller = new FullRecipeController modPack:@_modPack, model:recipe + @_recipeControllers.push controller + controller.render() + controller.$el.hide() + @$recipeContainer.append controller.$el + controller.$el.fadeIn duration:Duration.normal + else + controller.model = recipe + index++ else - @$recipeContainer.fadeOut duration:Duration.fast + @$recipesSection.fadeOut duration:Duration.fast + + while @_recipeControllers.length > index + controller = @_recipeControllers.pop() + controller.fadeOut duration:Duration.fast, complete:-> controller.$el.remove() _refreshSimilarItems: -> group = @model.item?.group diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee index 12e63c1f0..cb905bd3a 100644 --- a/src/scripts/models/item_page.coffee +++ b/src/scripts/models/item_page.coffee @@ -25,7 +25,6 @@ module.exports = class ItemPage extends BaseModel Object.defineProperties this, craftingRawMaterials: {get:-> @_plan.need} craftingSteps: {get:-> @_plan.steps} - primaryRecipe: {get:-> @_primaryRecipe} # Property Methods ############################################################################# @@ -56,6 +55,11 @@ module.exports = class ItemPage extends BaseModel return null unless result.length > 0 return result + findRecipes: -> + result = @modPack.findRecipes @item?.slug + return null unless result.length > 0 + return result + # Private Methods ############################################################################## _updateCraftingPlan: -> diff --git a/src/templates/item_page.jade b/src/templates/item_page.jade index b55b68e1d..453b73009 100644 --- a/src/templates/item_page.jade +++ b/src/templates/item_page.jade @@ -14,10 +14,9 @@ .byline: p from .description: p - .recipe.section - h2 Recipe + .recipes.section + h2 Recipes .panel - .view__full_recipe .usedInMaking: .view__item_group .similar: .view__item_group From af2258ff76820284178d38dbc8b8bdf971e3ba21 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 14:40:26 -0800 Subject: [PATCH 03/11] Set page title for item detail pages --- src/scripts/controllers/item_page_controller.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index 33344a766..a897e5178 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -13,6 +13,7 @@ ImageLoader = require './image_loader' Item = require '../models/item' ItemGroupController = require './item_group_controller' ItemPage = require '../models/item_page' +{Text} = require '../constants' {Url} = require '../constants' ######################################################################################################################## @@ -52,6 +53,7 @@ module.exports = class ItemPageController extends BaseController super refresh: -> + $('title').html if @model.item? then "#{@model.item.name} | #{Text.title}" else Text.title @_resolveItemSlug() display = @_modPack.findItemDisplay @model.item?.slug From c966bae2ab1ef1af99b91eaa8464827658e962cf Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 14:53:54 -0800 Subject: [PATCH 04/11] Allow stack views to link to the items they show --- src/css/templates/stack.scss | 9 ++++++++- src/scripts/controllers/stack_controller.coffee | 5 +++-- src/templates/stack.jade | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/css/templates/stack.scss b/src/css/templates/stack.scss index 5f7ce9042..2d162c55b 100644 --- a/src/css/templates/stack.scss +++ b/src/css/templates/stack.scss @@ -34,9 +34,16 @@ All rights reserved. } } - td.name p { + td.name a { + color: $color-text; display: inline; font-size: $font-size-normal; + text-decoration: none; + + &:hover { + color: $color-active-hover; + text-decoration: underline; + } } td.action { diff --git a/src/scripts/controllers/stack_controller.coffee b/src/scripts/controllers/stack_controller.coffee index 118c33345..541b8974a 100644 --- a/src/scripts/controllers/stack_controller.coffee +++ b/src/scripts/controllers/stack_controller.coffee @@ -37,7 +37,7 @@ module.exports = class StackController extends BaseController onDidRender: -> @$action = @$('.action') @$image = @$('.icon img') - @$nameField = @$('.name p') + @$nameLink = @$('.name a') @$quantityField = @$('.quantity p') @$removeButton = @$('button.remove') super @@ -46,7 +46,8 @@ module.exports = class StackController extends BaseController display = @modPack.findItemDisplay @model.slug @_imageLoader.load display.iconUrl, @$image - @$nameField.html display.itemName + @$nameLink.html display.itemName + @$nameLink.attr 'href', display.itemUrl @$quantityField.html @model.quantity @$removeButton.css display:(if @editable then 'inherit' else 'none') diff --git a/src/templates/stack.jade b/src/templates/stack.jade index 594b2c1bd..ef8399d1c 100644 --- a/src/templates/stack.jade +++ b/src/templates/stack.jade @@ -8,6 +8,6 @@ tr.view__stack td.quantity: p td.icon: img(src='') - td.name(width='*'): p + td.name(width='*'): a td.action button.remove   From b195177e1f4ffbda04c4b4e9aa4116522df69219 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 15:55:39 -0800 Subject: [PATCH 05/11] Add item declarations for non-craftable MC items * Update the `convert-nei-dump` script to avoid overwriting an `mod-version.cg` file and to only add those items which are missing --- scripts/convert-nei-dump | 9 +- .../experimental-2.2.663/mod-version.cg | 855 ++++++------- .../1.7.10/images/bottle_o_enchanting.png | Bin 2135 -> 2261 bytes src/data/minecraft/1.7.10/images/button.png | Bin 0 -> 259 bytes src/data/minecraft/1.7.10/images/clay.png | Bin 242 -> 2367 bytes src/data/minecraft/1.7.10/images/clock.png | Bin 334 -> 328 bytes src/data/minecraft/1.7.10/images/compass.png | Bin 265 -> 261 bytes .../1.7.10/images/enchanted_book.png | Bin 2875 -> 2956 bytes src/data/minecraft/1.7.10/images/fire.png | Bin 690 -> 648 bytes .../minecraft/1.7.10/images/furnace_2.png | Bin 1992 -> 0 bytes src/data/minecraft/1.7.10/images/lava.png | Bin 768 -> 643 bytes src/data/minecraft/1.7.10/images/melon.png | Bin 328 -> 1440 bytes src/data/minecraft/1.7.10/images/milk.png | Bin 1147 -> 245 bytes .../1.7.10/images/monster_spawner.png | Bin 1594 -> 1660 bytes .../1.7.10/images/monster_spawner_10.png | Bin 1679 -> 0 bytes .../1.7.10/images/monster_spawner_11.png | Bin 1829 -> 0 bytes .../1.7.10/images/monster_spawner_12.png | Bin 1575 -> 0 bytes .../1.7.10/images/monster_spawner_13.png | Bin 1615 -> 0 bytes .../1.7.10/images/monster_spawner_14.png | Bin 1585 -> 0 bytes .../1.7.10/images/monster_spawner_15.png | Bin 1653 -> 0 bytes .../1.7.10/images/monster_spawner_16.png | Bin 1547 -> 0 bytes .../1.7.10/images/monster_spawner_17.png | Bin 1841 -> 0 bytes .../1.7.10/images/monster_spawner_18.png | Bin 1479 -> 0 bytes .../1.7.10/images/monster_spawner_19.png | Bin 1688 -> 0 bytes .../1.7.10/images/monster_spawner_2.png | Bin 1671 -> 0 bytes .../1.7.10/images/monster_spawner_20.png | Bin 1844 -> 0 bytes .../1.7.10/images/monster_spawner_21.png | Bin 1832 -> 0 bytes .../1.7.10/images/monster_spawner_22.png | Bin 1651 -> 0 bytes .../1.7.10/images/monster_spawner_23.png | Bin 1565 -> 0 bytes .../1.7.10/images/monster_spawner_24.png | Bin 1631 -> 0 bytes .../1.7.10/images/monster_spawner_25.png | Bin 1683 -> 0 bytes .../1.7.10/images/monster_spawner_26.png | Bin 1698 -> 0 bytes .../1.7.10/images/monster_spawner_27.png | Bin 1716 -> 0 bytes .../1.7.10/images/monster_spawner_28.png | Bin 1681 -> 0 bytes .../1.7.10/images/monster_spawner_29.png | Bin 2298 -> 0 bytes .../1.7.10/images/monster_spawner_3.png | Bin 1703 -> 0 bytes .../1.7.10/images/monster_spawner_4.png | Bin 1757 -> 0 bytes .../1.7.10/images/monster_spawner_5.png | Bin 1660 -> 0 bytes .../1.7.10/images/monster_spawner_6.png | Bin 1772 -> 0 bytes .../1.7.10/images/monster_spawner_7.png | Bin 1906 -> 0 bytes .../1.7.10/images/monster_spawner_8.png | Bin 1681 -> 0 bytes .../1.7.10/images/monster_spawner_9.png | Bin 1788 -> 0 bytes src/data/minecraft/1.7.10/images/mushroom.png | Bin 1186 -> 166 bytes .../minecraft/1.7.10/images/mushroom_4.png | Bin 1186 -> 0 bytes .../minecraft/1.7.10/images/music_disc_10.png | Bin 250 -> 0 bytes .../minecraft/1.7.10/images/music_disc_11.png | Bin 257 -> 0 bytes .../minecraft/1.7.10/images/music_disc_12.png | Bin 267 -> 0 bytes .../minecraft/1.7.10/images/music_disc_2.png | Bin 248 -> 0 bytes .../minecraft/1.7.10/images/music_disc_3.png | Bin 243 -> 0 bytes .../minecraft/1.7.10/images/music_disc_4.png | Bin 247 -> 0 bytes .../minecraft/1.7.10/images/music_disc_5.png | Bin 245 -> 0 bytes .../minecraft/1.7.10/images/music_disc_6.png | Bin 247 -> 0 bytes .../minecraft/1.7.10/images/music_disc_7.png | Bin 243 -> 0 bytes .../minecraft/1.7.10/images/music_disc_8.png | Bin 240 -> 0 bytes .../minecraft/1.7.10/images/music_disc_9.png | Bin 235 -> 0 bytes .../minecraft/1.7.10/images/nether_brick.png | Bin 269 -> 1352 bytes .../minecraft/1.7.10/images/nether_star.png | Bin 991 -> 1254 bytes src/data/minecraft/1.7.10/images/portal.png | Bin 2897 -> 0 bytes .../1.7.10/images/potion_of_harming.png | Bin 840 -> 850 bytes .../1.7.10/images/potion_of_healing.png | Bin 815 -> 819 bytes .../1.7.10/images/potion_of_invisibility.png | Bin 0 -> 870 bytes .../1.7.10/images/pressure_plate.png | Bin 0 -> 566 bytes src/data/minecraft/1.7.10/images/snow.png | Bin 0 -> 431 bytes .../images/splash_potion_of_harming.png | Bin 872 -> 864 bytes .../images/splash_potion_of_healing.png | Bin 856 -> 871 bytes .../minecraft/1.7.10/images/stone_slab.png | Bin 829 -> 840 bytes src/data/minecraft/1.7.10/images/water.png | Bin 739 -> 702 bytes .../minecraft/1.7.10/images/written_book.png | Bin 2641 -> 2505 bytes src/data/minecraft/1.7.10/mod-version.cg | 1077 +++++++++++------ 69 files changed, 1133 insertions(+), 808 deletions(-) create mode 100644 src/data/minecraft/1.7.10/images/button.png delete mode 100644 src/data/minecraft/1.7.10/images/furnace_2.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_10.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_11.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_12.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_13.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_14.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_15.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_16.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_17.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_18.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_19.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_2.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_20.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_21.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_22.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_23.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_24.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_25.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_26.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_27.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_28.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_29.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_3.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_4.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_5.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_6.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_7.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_8.png delete mode 100644 src/data/minecraft/1.7.10/images/monster_spawner_9.png delete mode 100644 src/data/minecraft/1.7.10/images/mushroom_4.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_10.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_11.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_12.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_2.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_3.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_4.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_5.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_6.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_7.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_8.png delete mode 100644 src/data/minecraft/1.7.10/images/music_disc_9.png delete mode 100644 src/data/minecraft/1.7.10/images/portal.png create mode 100644 src/data/minecraft/1.7.10/images/potion_of_invisibility.png create mode 100644 src/data/minecraft/1.7.10/images/pressure_plate.png create mode 100644 src/data/minecraft/1.7.10/images/snow.png diff --git a/scripts/convert-nei-dump b/scripts/convert-nei-dump index 86deee178..bb25f4d44 100755 --- a/scripts/convert-nei-dump +++ b/scripts/convert-nei-dump @@ -32,9 +32,6 @@ if [[ "$SOURCE_DIR" == "" || "$TARGET_DIR" == "" ]]; then die fi -echo "schema: 1" > $DATA_FILE -echo "" >> $DATA_FILE - mkdir -p $TARGET_DIR/images ls $SOURCE_DIR/itempanel_icons | while read FILE; do ITEM_NAME="$(echo $FILE | sed 's/.png//')" @@ -46,6 +43,8 @@ ls $SOURCE_DIR/itempanel_icons | while read FILE; do | tr '[A-Z]' '[a-z]' \ ).png" cp "$SOURCE_DIR/itempanel_icons/$FILE" "$TARGET_DIR/images/$TARGET_FILE" - echo "item: $ITEM_NAME" >> $DATA_FILE - echo "" >> $DATA_FILE + if ! grep -q "item: $ITEM_NAME$" $DATA_FILE; then + echo "item: $ITEM_NAME" >> $DATA_FILE + echo "" >> $DATA_FILE + fi done diff --git a/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg b/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg index fd691818b..152e650d0 100644 --- a/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg +++ b/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg @@ -3,28 +3,28 @@ schema: 1 group: Agriculture item: Bio Chaff - + item: Biogas - + item: Biogas Cell recipe: input: Biogas, Empty Cell pattern: ... .0. .1. - + item: Biomass - + item: Biomass Cell recipe: input: Biomass, Empty Cell pattern: ... .0. .1. - + item: Coffee recipe: input: Dark Coffee, Milk, Sugar pattern: 02. 1.. ... - + item: Coffee Beans - + item: Coffee Powder recipe: input: Coffee Beans @@ -34,7 +34,7 @@ group: Agriculture pattern: ... .0. ... quantity: 3 tools: Macerator - + item: Cold Coffee recipe: input: Coffee Powder, Stone Mug, Water Bottle @@ -42,44 +42,44 @@ group: Agriculture recipe: input: Coffee Powder, Stone Mug, Water Cell pattern: 10. 2.. ... - + item: Crop recipe: input: Stick pattern: ... 0.0 0.0 quantity: 2 tools: Crafting Table - + item: Crop Harvester recipe: input: Basic Machine Casing, Chest, Crop, Electronic Circuit, Shears pattern: 313 404 222 tools: Crafting Table - + item: Crop-Matron recipe: input: Basic Machine Casing, Chest, Crop, Electronic Circuit, Empty Cell pattern: 313 404 222 tools: Crafting Table - + item: Cropnalyzer recipe: input: Electronic Circuit, Glass, Insulated Copper Cable, Redstone pattern: 22. 313 303 tools: Crafting Table - + item: Dark Coffee recipe: input: Cold Coffee, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Empty Booze Barrel recipe: input: Oak Wood Planks, Rubber Wood pattern: .0. .1. .0. tools: Crafting Table - + item: Fertilizer recipe: input: Bone Meal, Scrap @@ -89,85 +89,104 @@ group: Agriculture input: Fertilizer, Scrap pattern: 11. 0.. ... quantity: 2 - + item: (Filled) Tin Can recipe: input: Steak, Tin Can pattern: 101 111 111 tools: Canning Machine + quantity: 8 recipe: input: Cooked Porkchop, Tin Can pattern: 101 111 111 tools: Canning Machine + quantity: 8 recipe: input: Baked Potato, Tin Can pattern: .0. 111 111 tools: Canning Machine + quantity: 6 recipe: input: Cooked Chicken, Tin Can pattern: .0. 111 111 tools: Canning Machine + quantity: 6 recipe: input: Pumpkin Pie, Tin Can pattern: .0. 111 111 tools: Canning Machine + quantity: 6 recipe: input: Mushroom Stew, Tin Can pattern: .0. 111 111 tools: Canning Machine + quantity: 6 recipe: input: Bread, Tin Can pattern: ... 101 111 tools: Canning Machine + quantity: 5 recipe: input: Cooked Fish, Tin Can pattern: ... 101 111 tools: Canning Machine + quantity: 5 recipe: input: Carrot, Tin Can pattern: ... .01 111 tools: Canning Machine + quantity: 4 recipe: input: Apple, Tin Can pattern: ... .01 111 tools: Canning Machine + quantity: 4 recipe: input: Raw Beef, Tin Can pattern: ... .0. 111 tools: Canning Machine + quantity: 3 recipe: input: Raw Porkchop, Tin Can pattern: ... .0. 111 tools: Canning Machine + quantity: 3 recipe: input: Melon, Tin Can pattern: ... .0. 1.1 tools: Canning Machine + quantity: 2 recipe: input: Cookie, Tin Can pattern: ... .0. 1.1 tools: Canning Machine + quantity: 2 recipe: input: Raw Chicken, Tin Can pattern: ... .0. 1.1 tools: Canning Machine + quantity: 2 recipe: input: Raw Fish, Tin Can pattern: ... .0. 1.1 tools: Canning Machine + quantity: 2 recipe: input: Potato, Tin Can pattern: ... .0. .1. tools: Canning Machine + quantity: 1 recipe: input: Poisonous Potato, Tin Can pattern: .0. .0. .1. tools: Canning Machine + quantity: 1 recipe: input: Rotten Flesh, Tin Can pattern: .0. .0. .1. tools: Canning Machine - + quantity: 1 + item: Grin Powder recipe: input: Poisonous Potato @@ -178,9 +197,9 @@ group: Agriculture pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Hops - + item: Plantball recipe: input: Wheat @@ -207,34 +226,34 @@ group: Agriculture input: Dead Bush pattern: 000 0.0 000 tools: Crafting Table - + item: Rubber Tree Leaves - + item: Rubber Tree Sapling - + item: Rubber Wood - + item: Stone Mug recipe: input: Stone pattern: 00. 000 00. tools: Crafting Table - + item: Terra Wart gatherable: yes - + item: Tin Can recipe: input: Tin Item Casing pattern: ... .0. ... tools: Metal Former - + item: Weed-EX recipe: input: Empty Cell, Grin Powder, Redstone pattern: .2. .1. .0. tools: Crafting Table - + group: Armor item: Bronze Boots @@ -242,67 +261,67 @@ group: Armor input: Bronze Ingot pattern: ... 0.0 0.0 tools: Crafting Table - + item: Bronze Chestplate recipe: input: Bronze Ingot pattern: 0.0 000 000 tools: Crafting Table - + item: Bronze Helmet recipe: input: Bronze Ingot pattern: 000 0.0 ... tools: Crafting Table - + item: Bronze Leggings recipe: input: Bronze Ingot pattern: 000 0.0 0.0 tools: Crafting Table - + item: CF Backpack recipe: input: CF Sprayer, Electronic Circuit, Iron Item Casing, Universal Fluid Cell pattern: 010 323 3.3 tools: Crafting Table - + item: Composite Vest recipe: input: Advanced Alloy, Iron Chestplate, Leather Tunic pattern: 0.0 020 010 tools: Crafting Table - + item: Hazmat Suit recipe: input: Orange Dye, Rubber pattern: 1.1 101 101 tools: Crafting Table - + item: Hazmat Suit Leggings recipe: input: Orange Dye, Rubber pattern: 101 1.1 1.1 tools: Crafting Table - + item: Jetpack recipe: input: Electronic Circuit, Iron Item Casing, Redstone, Universal Fluid Cell pattern: 101 131 2.2 tools: Crafting Table - + item: Rubber Boots recipe: input: Rubber, Wool pattern: 0.0 0.0 010 tools: Crafting Table - + item: Scuba Helmet recipe: input: Glass, Iron Bars, Orange Dye, Rubber pattern: .2. 303 313 tools: Crafting Table - + item: Static Boots recipe: input: Insulated Copper Cable, Iron Ingot, Wool @@ -312,7 +331,7 @@ group: Armor input: Insulated Copper Cable, Iron Boots, Wool pattern: .1. .2. 000 tools: Crafting Table - + group: Armor: Powered item: Advanced Batpack @@ -320,79 +339,79 @@ group: Armor: Powered input: Advanced RE-Battery, Copper Item Casing, Electronic Circuit pattern: 020 010 0.0 tools: Crafting Table - + item: BatPack recipe: input: Electronic Circuit, Oak Wood Planks, RE-Battery pattern: 202 212 2.2 tools: Crafting Table - + item: Electric Jetpack recipe: input: Advanced Circuit, BatBox, Glowstone Dust, Iron Item Casing pattern: 303 313 2.2 tools: Crafting Table - + item: Energypack recipe: input: Advanced Circuit, Energy Crystal, Iron Item Casing pattern: 020 121 2.2 tools: Crafting Table - + item: NanoSuit Bodyarmor recipe: input: Carbon Plate, Energy Crystal pattern: 0.0 010 000 tools: Crafting Table - + item: NanoSuit Boots recipe: input: Carbon Plate, Energy Crystal pattern: ... 0.0 010 tools: Crafting Table - + item: NanoSuit Helmet recipe: input: Carbon Plate, Energy Crystal, Nightvision Goggles pattern: ... 010 020 tools: Crafting Table - + item: NanoSuit Leggings recipe: input: Carbon Plate, Energy Crystal pattern: 010 0.0 0.0 tools: Crafting Table - + item: Nightvision Goggles recipe: input: Advanced Circuit, Advanced Heat Exchanger, Advanced RE-Battery, Luminator, Reinforced Glass, Rubber pattern: 121 343 505 tools: Crafting Table - + item: QuantumSuit Bodyarmor recipe: input: Advanced Alloy, Electric Jetpack, Iridium Reinforced Plate, Lapotron Crystal, NanoSuit Bodyarmor pattern: 040 232 212 tools: Crafting Table - + item: QuantumSuit Boots recipe: input: Iridium Reinforced Plate, Lapotron Crystal, NanoSuit Boots, Rubber Boots pattern: ... 020 313 tools: Crafting Table - + item: QuantumSuit Helmet recipe: input: Advanced Circuit, Iridium Reinforced Plate, Lapotron Crystal, NanoSuit Helmet, Reinforced Glass, Scuba Helmet pattern: 434 121 050 tools: Crafting Table - + item: QuantumSuit Leggings recipe: input: Basic Machine Casing, Glowstone Dust, Iridium Reinforced Plate, Lapotron Crystal, NanoSuit Leggings pattern: 030 242 1.1 tools: Crafting Table - + item: Solar Helmet recipe: input: Insulated Copper Cable, Iron Ingot, Solar Panel @@ -402,7 +421,7 @@ group: Armor: Powered input: Insulated Copper Cable, Iron Helmet, Solar Panel pattern: .1. .2. 000 tools: Crafting Table - + group: Energy: Generation item: Generator @@ -414,49 +433,49 @@ group: Energy: Generation input: Basic Machine Casing, Furnace, RE-Battery pattern: .2. .0. .1. tools: Crafting Table - + item: Geothermal Generator recipe: input: Empty Cell, Generator, Glass, Iron Item Casing pattern: 202 202 313 tools: Crafting Table - + item: Kinetic Generator recipe: input: Electric Motor, Generator, Iron Item Casing, Shaft (Iron) pattern: 222 103 222 tools: Crafting Table - + item: Radioisotope Thermoelectric Generator recipe: input: Generator, Iron Item Casing, Reactor Chamber pattern: 111 121 101 tools: Crafting Table - + item: Semifluid Generator recipe: input: Geothermal Generator, Iron Item Casing, Universal Fluid Cell pattern: 121 202 121 tools: Crafting Table - + item: Solar Panel recipe: input: Coal Dust, Electronic Circuit, Generator, Glass pattern: 030 303 121 tools: Crafting Table - + item: Stirling Generator recipe: input: Generator, Heat Conductor, Iron Item Casing pattern: 212 202 222 tools: Crafting Table - + item: Water Mill recipe: input: Generator, Oak Wood Planks, Stick pattern: 212 101 212 tools: Crafting Table - + group: Energy: Storage item: Advanced RE-Battery @@ -464,73 +483,73 @@ group: Energy: Storage input: Bronze Item Casing, Insulated Copper Cable, Lead Dust, Sulfur Dust pattern: 101 030 020 tools: Crafting Table - + item: BatBox recipe: input: Insulated Tin Cable, Oak Wood Planks, RE-Battery pattern: 101 222 111 tools: Crafting Table - + item: CESU recipe: input: Advanced RE-Battery, Bronze Plate, Insulated Copper Cable pattern: 121 000 111 tools: Crafting Table - + item: Charge Pad (BatBox) recipe: input: BatBox, Electronic Circuit, Pressure Plate (stone), Rubber pattern: ... 121 303 tools: Crafting Table - + item: Charge Pad (CESU) recipe: input: CESU, Electronic Circuit, Pressure Plate (stone), Rubber pattern: ... 121 303 tools: Crafting Table - + item: Charge Pad (MFE) recipe: input: Electronic Circuit, MFE, Pressure Plate (stone), Rubber pattern: ... 020 313 tools: Crafting Table - + item: Charge Pad (MFSU) recipe: input: Electronic Circuit, MFSU, Pressure Plate (stone), Rubber pattern: ... 020 313 tools: Crafting Table - + item: Energy Crystal recipe: input: Energium Dust pattern: 000 000 000 tools: Compressor - + item: MFE recipe: input: Basic Machine Casing, Energy Crystal, Insulated Gold Cable pattern: 212 101 212 tools: Crafting Table - + item: MFSU recipe: input: Advanced Circuit, Advanced Machine Casing, Lapotron Crystal, MFE pattern: 202 232 212 tools: Crafting Table - + item: MFSU Upgrade Kit recipe: input: Advanced Circuit, Advanced Machine Casing, Lapotron Crystal, Wrench pattern: 202 232 212 tools: Crafting Table - + item: RE-Battery recipe: input: Insulated Tin Cable, Redstone, Tin Item Casing pattern: .0. 212 212 tools: Crafting Table - + item: Single-Use Battery recipe: input: Coal Dust, Insulated Copper Cable, Redstone @@ -542,7 +561,7 @@ group: Energy: Storage pattern: .1. .2. .0. quantity: 8 tools: Crafting Table - + group: Energy: Transmission item: Copper Cable @@ -561,31 +580,31 @@ group: Energy: Transmission pattern: ... .0. ... quantity: 4 tools: Metal Former - + item: EU-Detector Cable recipe: input: Electronic Circuit, Insulated Copper Cable, Redstone pattern: .0. 212 .2. tools: Crafting Table - + item: EU-Splitter Cable recipe: input: Insulated HV Cable, Lever, Redstone pattern: .2. 010 .2. tools: Crafting Table - + item: EV-Transformer recipe: input: Advanced Circuit, HV-Transformer, Insulated HV Cable, Lapotron Crystal pattern: .2. 013 .2. tools: Crafting Table - + item: Glass Fibre Cable recipe: input: Energium Dust, Glass, Silver Dust pattern: 111 020 111 tools: Crafting Table - + item: Gold Cable recipe: extras: Cutter @@ -602,7 +621,7 @@ group: Energy: Transmission pattern: ... .0. ... quantity: 4 tools: Metal Former - + item: HV Cable recipe: input: Iron Ingot @@ -614,45 +633,45 @@ group: Energy: Transmission pattern: ... .0. ... quantity: 4 tools: Metal Former - + item: HV-Transformer recipe: input: Advanced RE-Battery, Electronic Circuit, Insulated Gold Cable, MV-Transformer pattern: .2. 130 .2. tools: Crafting Table - + item: Insulated Copper Cable recipe: input: Copper Cable, Rubber pattern: ... 01. ... - + item: Insulated Gold Cable recipe: input: Gold Cable, Rubber pattern: 11. .0. ... - + item: Insulated HV Cable recipe: input: HV Cable, Rubber pattern: 11. 10. ... - + item: Insulated Tin Cable recipe: input: Rubber, Tin Cable pattern: ... 10. ... - + item: LV-Transformer recipe: input: Coil, Insulated Tin Cable, Oak Wood Planks pattern: 212 202 212 tools: Crafting Table - + item: MV-Transformer recipe: input: Basic Machine Casing, Insulated Copper Cable pattern: .1. .0. .1. tools: Crafting Table - + item: Tin Cable recipe: extras: Cutter @@ -669,7 +688,7 @@ group: Energy: Transmission pattern: ... .0. ... quantity: 3 tools: Metal Former - + group: Machine Parts item: Advanced Circuit @@ -677,37 +696,37 @@ group: Machine Parts input: Electronic Circuit, Glowstone Dust, Lapis Lazuli, Redstone pattern: 313 202 313 tools: Crafting Table - + item: Advanced Machine Casing recipe: input: Advanced Alloy, Basic Machine Casing, Carbon Plate, Refined Iron Plate pattern: 323 010 323 tools: Crafting Table - + item: Basic Machine Casing recipe: input: Iron Plate pattern: 000 0.0 000 tools: Crafting Table - + item: Block Cutting Blade (Diamond) recipe: input: Diamond, Refined Iron Ingot pattern: 000 010 000 tools: Crafting Table - + item: Block Cutting Blade (Iron) recipe: input: Iron Plate, Stone pattern: 000 010 000 tools: Crafting Table - + item: Block Cutting Blade (Refined Iron) recipe: input: Iron Ingot, Refined Iron Plate pattern: 111 101 111 tools: Crafting Table - + item: Bronze Item Casing recipe: extras: Forge Hammer @@ -719,7 +738,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Bronze Plate recipe: extras: Forge Hammer @@ -734,31 +753,31 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Carbon Plate recipe: input: Raw Carbon Mesh pattern: ... .0. ... tools: Compressor - + item: Carbon Rotor Blade recipe: input: Carbon Plate, Raw Carbon Mesh pattern: 010 010 010 tools: Crafting Table - + item: Coil recipe: input: Copper Cable, Iron Ingot pattern: 000 010 000 tools: Crafting Table - + item: Copper Boiler recipe: input: Copper Item Casing pattern: 000 0.0 000 tools: Crafting Table - + item: Copper Item Casing recipe: extras: Forge Hammer @@ -770,7 +789,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Copper Plate recipe: extras: Forge Hammer @@ -785,103 +804,103 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Crystal Memory recipe: input: Crystal Memory (raw), furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Crystal Memory (raw) recipe: input: Obsidian Dust, Silicon Dioxide pattern: 101 010 101 tools: Crafting Table - + item: Dense Bronze Plate recipe: input: Bronze Plate pattern: 000 000 000 tools: Compressor - + item: Dense Copper Plate recipe: input: Copper Plate pattern: 000 000 000 tools: Compressor - + item: Dense Gold Plate recipe: input: Gold Plate pattern: 000 000 000 tools: Compressor - + item: Dense Iron Plate recipe: input: Iron Plate pattern: 000 000 000 tools: Compressor - + item: Dense Lapis Lazuli Plate recipe: input: Lapis Lazuli Plate pattern: 000 000 000 tools: Compressor - + item: Dense Lead Plate recipe: input: Lead Plate pattern: 000 000 000 tools: Compressor - + item: Dense Obsidian Plate recipe: input: Obsidian Plate pattern: 000 000 000 tools: Compressor - + item: Dense Refined Iron Plate recipe: input: Refined Iron Plate pattern: 000 000 000 tools: Compressor - + item: Dense Tin Plate recipe: input: Tin Plate pattern: 000 000 000 tools: Compressor - + item: Ejector Upgrade recipe: input: Electronic Circuit, Hopper, Insulated Copper Cable, Piston pattern: ... 313 202 tools: Crafting Table - + item: Electric Motor recipe: input: Coil, Iron Ingot, Tin Item Casing pattern: .2. 010 .2. tools: Crafting Table - + item: Electronic Circuit recipe: input: Insulated Copper Cable, Iron Plate, Redstone pattern: 000 212 000 tools: Crafting Table - + item: Energy Storage Upgrade recipe: input: Electronic Circuit, Insulated Copper Cable, Oak Wood Planks, RE-Battery pattern: 222 131 202 tools: Crafting Table - + item: Fluid Ejector Upgrade recipe: input: Electric Motor, Tin Plate pattern: 1.1 .0. 1.1 tools: Crafting Table - + item: Gold Item Casing recipe: extras: Forge Hammer @@ -893,7 +912,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Gold Plate recipe: extras: Forge Hammer @@ -907,13 +926,13 @@ group: Machine Parts input: Block of Gold pattern: ... .0. ... quantity: 9 - + item: Iridium Reinforced Plate recipe: input: Advanced Alloy, Diamond, Iridium Ore pattern: 202 010 202 tools: Crafting Table - + item: Iron Item Casing recipe: extras: Forge Hammer @@ -925,7 +944,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Iron Plate recipe: extras: Forge Hammer @@ -940,43 +959,43 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Iron Rotor Blade recipe: input: Iron Ingot, Iron Plate pattern: 101 101 101 tools: Crafting Table - + item: Iron Turning Blank recipe: input: Iron Ingot, Iron Item Casing pattern: ... 010 ... tools: Crafting Table - + item: Kinetic Wind Generator Rotor (Carbon) recipe: input: Carbon Rotor Blade, Shaft (Refined Iron) pattern: .0. 010 .0. tools: Crafting Table - + item: Kinetic Wind Generator Rotor (Iron) recipe: input: Iron Rotor Blade, Shaft (Iron) pattern: .0. 010 .0. tools: Crafting Table - + item: Kinetic Wind Generator Rotor (Steel) recipe: input: Shaft (Iron), Steel Rotor Blade pattern: .1. 101 .1. tools: Crafting Table - + item: Kinetic Wind Generator Rotor (Wood) recipe: input: Iron Ingot, Wood Rotor Blade pattern: .1. 101 .1. tools: Crafting Table - + item: Lapis Lazuli Plate recipe: input: Lapis Lazuli Dust @@ -992,13 +1011,13 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Lapotron Crystal recipe: input: Advanced Circuit, Energy Crystal, Lapis Lazuli Dust pattern: 202 212 202 tools: Crafting Table - + item: Lead Item Casing recipe: extras: Forge Hammer @@ -1010,7 +1029,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Lead Plate recipe: extras: Forge Hammer @@ -1025,14 +1044,14 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Mining Pipe recipe: input: Iron Plate, Treetap pattern: 0.0 0.0 010 quantity: 8 tools: Crafting Table - + item: Obsidian Plate recipe: input: Obsidian @@ -1048,36 +1067,36 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Overclocker Upgrade recipe: input: 10k Coolant Cell, Electronic Circuit, Insulated Copper Cable pattern: ... 000 212 tools: Crafting Table - + item: Power Unit recipe: input: Copper Cable, Electric Motor, Electronic Circuit, Iron Item Casing, RE-Battery pattern: 403 421 403 tools: Crafting Table - + item: Raw Carbon Fibre recipe: input: Coal Dust pattern: 00. 00. ... - + item: Raw Carbon Mesh recipe: input: Raw Carbon Fibre pattern: ... 00. ... tools: Crafting Table - + item: Redstone Signal Inverter Upgrade recipe: input: Lever, Tin Plate pattern: 1.1 .0. 1.1 tools: Crafting Table - + item: Refined Iron Block recipe: input: Refined Iron Ingot @@ -1087,14 +1106,14 @@ group: Machine Parts input: Refined Iron Ingot pattern: 000 000 000 tools: Compressor - + item: Refined Iron Item Casing recipe: input: Refined Iron Plate pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Refined Iron Plate recipe: input: Refined Iron Ingot @@ -1105,7 +1124,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Rubber recipe: input: Sticky Resin, furnace fuel @@ -1124,85 +1143,85 @@ group: Machine Parts input: Rubber Tree Sapling pattern: ... .0. ... tools: Extractor - + item: Shaft (Iron) recipe: input: Block of Iron pattern: ... .0. ... tools: Metal Former - + item: Shaft (Refined Iron) recipe: input: Refined Iron Block pattern: ... .0. ... tools: Metal Former - + item: Small Power Unit recipe: input: Copper Cable, Electric Motor, Electronic Circuit, Iron Item Casing, RE-Battery pattern: .03 421 .03 tools: Crafting Table - + item: Steam Turbine recipe: input: Steam Turbine Blade pattern: ... 000 ... tools: Crafting Table - + item: Steam Turbine Blade recipe: input: Refined Iron Ingot, Refined Iron Plate pattern: 111 101 111 tools: Crafting Table - + item: Steel Rotor Blade recipe: input: Refined Iron Ingot, Refined Iron Plate pattern: 101 101 101 tools: Crafting Table - + item: TFBP - Chilling recipe: input: Snowball, TFBP - Empty pattern: .0. 010 .0. tools: Crafting Table - + item: TFBP - Cultivation recipe: input: Seeds, TFBP - Empty pattern: .0. 010 .0. tools: Crafting Table - + item: TFBP - Desertification recipe: input: Sand, TFBP - Empty pattern: .0. 010 .0. tools: Crafting Table - + item: TFBP - Empty recipe: input: Advanced Circuit, Electronic Circuit, Redstone pattern: .1. .0. 2.2 tools: Crafting Table - + item: TFBP - Flatification recipe: input: Dirt, TFBP - Empty pattern: .0. 010 .0. tools: Crafting Table - + item: TFBP - Irrigation recipe: input: TFBP - Empty, Water Bucket pattern: .1. 101 .1. tools: Crafting Table - + item: TFBP - Mushroom recipe: input: Mushroom (brown), Mycelium, TFBP - Empty pattern: 101 020 101 tools: Crafting Table - + item: Tin Item Casing recipe: extras: Forge Hammer @@ -1214,7 +1233,7 @@ group: Machine Parts pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Tin Plate recipe: extras: Forge Hammer @@ -1229,25 +1248,25 @@ group: Machine Parts pattern: ... .0. ... quantity: 9 tools: Block Cutting Machine - + item: Transformer Upgrade recipe: input: Electronic Circuit, Glass, Insulated Gold Cable, MV-Transformer pattern: 111 232 101 tools: Crafting Table - + item: Wood Rotor Blade recipe: input: Oak Wood, Oak Wood Planks pattern: 101 101 101 tools: Crafting Table - + item: Wooden Turning Blank recipe: input: Oak Wood Planks, Stick pattern: 000 111 000 tools: Crafting Table - + group: Machines item: Advanced Miner @@ -1255,224 +1274,224 @@ group: Machines input: Advanced Alloy, Advanced Machine Casing, MFE, Miner, Teleporter pattern: 030 214 030 tools: Crafting Table - + item: Blast Furnace recipe: input: Basic Machine Casing, Heat Conductor, Iron Item Casing pattern: 222 202 212 tools: Crafting Table - + item: Block Cutting Machine recipe: input: Advanced Circuit, Advanced Machine Casing, Electric Motor, Shaft (Iron) pattern: .0. .1. 232 tools: Crafting Table - + item: Compressor recipe: input: Basic Machine Casing, Electronic Circuit, Stone pattern: 2.2 202 212 tools: Crafting Table - + item: Condenser recipe: input: Basic Machine Casing, Electronic Circuit, Empty Cell, Iron Item Casing pattern: 232 202 313 tools: Crafting Table - + item: Electric Furnace recipe: input: Electronic Circuit, Iron Furnace, Redstone pattern: ... .0. 212 tools: Crafting Table - + item: Electric Heat Generator recipe: input: Electronic Circuit, Heat Conductor, Iron Item Casing, RE-Battery pattern: 232 202 212 tools: Crafting Table - + item: Electric Sorting Machine recipe: input: Basic Machine Casing, Chest, Ejector Upgrade, Electronic Circuit pattern: 232 202 212 tools: Crafting Table - + item: Electrolyzer recipe: input: Basic Machine Casing, Electronic Circuit, Empty Cell, Insulated Copper Cable pattern: 3.3 313 202 tools: Crafting Table - + item: Energy-O-Mat recipe: input: Basic Machine Casing, Insulated Copper Cable, RE-Battery, Redstone pattern: ... 323 101 tools: Crafting Table - + item: Extractor recipe: input: Basic Machine Casing, Electronic Circuit, Treetap pattern: ... 202 212 tools: Crafting Table - + item: Fermenter recipe: input: Empty Cell, Heat Conductor, Iron Item Casing pattern: 222 000 212 tools: Crafting Table - + item: Fluid Distributor recipe: input: Basic Machine Casing, Empty Cell, Fluid Ejector Upgrade pattern: 222 202 111 tools: Crafting Table - + item: Fluid Regulator recipe: input: Electric Motor, Electronic Circuit, Empty Cell, Iron Item Casing pattern: 333 202 313 tools: Crafting Table - + item: Fluid/Solid Canning Machine recipe: input: Basic Machine Casing, Electronic Circuit, Tin Item Casing pattern: 212 202 222 tools: Crafting Table - + item: Induction Furnace recipe: input: Advanced Machine Casing, Copper Ingot, Electric Furnace pattern: 111 121 101 tools: Crafting Table - + item: Iron Furnace recipe: input: Furnace, Iron Plate pattern: .1. 1.1 101 tools: Crafting Table - + item: Item Buffer recipe: input: Basic Machine Casing, Chest, Iron Item Casing pattern: 222 101 222 tools: Crafting Table - + item: Luminator recipe: input: Glass, Insulated Copper Cable, Iron Item Casing, Tin Cable pattern: 212 030 000 quantity: 8 tools: Crafting Table - + item: Macerator recipe: input: Basic Machine Casing, Cobblestone, Electronic Circuit, Flint pattern: 333 101 .2. tools: Crafting Table - + item: Magnetizer recipe: input: Basic Machine Casing, Iron Fence, Redstone pattern: 212 202 212 tools: Crafting Table - + item: Mass Fabricator recipe: input: Advanced Circuit, Advanced Machine Casing, Glowstone Dust, Lapotron Crystal pattern: 202 131 202 tools: Crafting Table - + item: Metal Former recipe: input: Basic Machine Casing, Coil, Electronic Circuit, Tool Box pattern: .2. 303 111 tools: Crafting Table - + item: Miner recipe: input: Basic Machine Casing, Chest, Electronic Circuit, Mining Pipe pattern: .1. 202 .3. tools: Crafting Table - + item: Ore Washing Plant recipe: input: Basic Machine Casing, Bucket, Electric Motor, Electronic Circuit, Iron Plate pattern: 444 101 232 tools: Crafting Table - + item: Pattern Storage recipe: input: Advanced Circuit, Advanced Machine Casing, Crystal Memory, Mining Laser, Reinforced Stone pattern: 444 212 303 tools: Crafting Table - + item: Personal Safe recipe: input: Basic Machine Casing, Chest, Electronic Circuit pattern: .2. .0. .1. tools: Crafting Table - + item: Pump recipe: input: Basic Machine Casing, Electronic Circuit, Empty Cell, Mining Pipe, Treetap pattern: 212 202 343 tools: Crafting Table - + item: Replicator recipe: input: HV-Transformer, MFE, Reinforced Glass, Reinforced Stone, Teleporter pattern: 323 444 010 tools: Crafting Table - + item: Scanner recipe: input: Advanced Circuit, Advanced Machine Casing, Electric Motor, Iron Plate, Luminator, Reinforced Glass pattern: 353 242 010 tools: Crafting Table - + item: Solar Distiller recipe: input: Basic Machine Casing, Glass, Universal Fluid Cell pattern: 111 1.1 202 tools: Crafting Table - + item: Solid Canning Machine recipe: input: Basic Machine Casing, Electronic Circuit, Tin Can pattern: .2. .2. 101 tools: Crafting Table - + item: Teleporter recipe: input: Advanced Circuit, Advanced Machine Casing, Diamond, Frequency Transmitter, Glass Fibre Cable pattern: 030 414 020 tools: Crafting Table - + item: Terraformer recipe: input: Advanced Machine Casing, Dirt, Glowstone Dust, TFBP - Empty pattern: 232 101 212 tools: Crafting Table - + item: Tesla Coil recipe: input: Electronic Circuit, Iron Item Casing, MV-Transformer, Redstone pattern: 333 323 101 tools: Crafting Table - + item: Thermal Centrifuge recipe: input: Advanced Machine Casing, Coil, Electric Motor, Iron Ingot, Mining Laser pattern: 141 303 323 tools: Crafting Table - + item: Trade-O-Mat recipe: input: Basic Machine Casing, Chest, Redstone pattern: ... 222 101 tools: Crafting Table - + group: Machines: Kinetic item: Electric Kinetic Generator @@ -1480,30 +1499,30 @@ group: Machines: Kinetic input: Electric Motor, Iron Item Casing, RE-Battery, Shaft (Iron) pattern: 121 131 101 tools: Crafting Table - + item: Kinetic Steam Generator recipe: input: Copper Boiler, Refined Iron Item Casing, Shaft (Iron), Universal Fluid Cell pattern: 111 022 311 tools: Crafting Table - + item: Kinetic Wind Generator recipe: input: Basic Machine Casing, Shaft (Iron) pattern: ... 101 ... tools: Crafting Table - + item: Manual Kinetic Generator recipe: input: Basic Machine Casing, Lever pattern: ... 01. ... - + item: Turning Table recipe: input: Basic Machine Casing, Iron Item Casing, Iron Plate, Shaft (Iron) pattern: 1.1 303 222 tools: Crafting Table - + group: Machines: Steam item: Fluid Heat Generator @@ -1511,13 +1530,13 @@ group: Machines: Steam input: Heat Conductor, Iron Item Casing, Universal Fluid Cell pattern: 121 202 121 tools: Crafting Table - + item: Radioisotope Heat Generator recipe: input: Heat Conductor, Iron Item Casing, Reactor Chamber pattern: 111 121 101 tools: Crafting Table - + item: Solid Heat Generator recipe: input: Heat Conductor, Iron Furnace, Iron Plate @@ -1527,19 +1546,19 @@ group: Machines: Steam input: Basic Machine Casing, Furnace, Heat Conductor pattern: .2. .0. .1. tools: Crafting Table - + item: Steam Generator recipe: input: Copper Boiler, Heat Conductor, Iron Item Casing pattern: 222 202 212 tools: Crafting Table - + group: Minerals item: Ashes - + item: Basalt - + item: Bronze Block recipe: input: Bronze Ingot @@ -1549,7 +1568,7 @@ group: Minerals input: Bronze Ingot pattern: 000 000 000 tools: Compressor - + item: Bronze Ingot recipe: input: Bronze Dust, furnace fuel @@ -1559,41 +1578,41 @@ group: Minerals input: Bronze Block pattern: ... .0. ... quantity: 9 - + item: CF Powder recipe: input: Clay, Sand, Stone Dust pattern: 212 202 212 tools: Crafting Table - + item: Coal Ball recipe: input: Coal Dust, Flint pattern: 000 010 000 tools: Crafting Table - + item: Coal Chunk recipe: input: Compressed Coal Ball, Obsidian pattern: 000 010 000 tools: Crafting Table - + item: Compressed Air Cell recipe: input: Empty Cell pattern: ... .0. ... tools: Compressor - + item: Compressed Coal Ball recipe: input: Coal Ball pattern: ... .0. ... tools: Compressor - + item: Construction Foam - + item: Construction Foam Cell - + item: Copper Block recipe: input: Copper Ingot @@ -1603,7 +1622,7 @@ group: Minerals input: Copper Ingot pattern: 000 000 000 tools: Compressor - + item: Copper Ingot recipe: input: Copper Ore, furnace fuel @@ -1625,18 +1644,18 @@ group: Minerals input: Copper Block pattern: ... .0. ... quantity: 9 - + item: Copper Ore - + item: Distilled Water - + item: Distilled Water Cell recipe: input: Distilled Water, Empty Cell pattern: ... .0. .1. - + item: Electrolyzed Water Cell - + item: Empty Cell recipe: input: Tin Plate @@ -1647,47 +1666,47 @@ group: Minerals input: Compressed Air Cell pattern: ... .0. ... tools: Extractor - + item: Hydration Cell recipe: input: Water Cell pattern: ... .0. ... tools: Extractor - + item: Industrial Credit recipe: input: Iron Item Casing pattern: ... .0. ... quantity: 2 tools: Metal Former - + item: Industrial TNT recipe: input: Flint, TNT pattern: 000 111 000 quantity: 4 tools: Crafting Table - + item: Iridium Ore - + item: Iron Fence recipe: input: Iron Item Casing pattern: ... .0. ... tools: Metal Former - + item: Iron Scaffold recipe: input: Iron Fence, Iron Plate pattern: 111 000 111 quantity: 16 tools: Crafting Table - + item: Lava Cell recipe: input: Empty Cell, Lava pattern: ... .1. .0. - + item: Lead Block recipe: input: Lead Ingot @@ -1697,7 +1716,7 @@ group: Minerals input: Lead Ingot pattern: 000 000 000 tools: Compressor - + item: Lead Ingot recipe: input: Lead Ore, furnace fuel @@ -1719,23 +1738,23 @@ group: Minerals input: Lead Block pattern: ... .0. ... quantity: 9 - + item: Lead Ore - + item: Mixed Metal Ingot recipe: input: Bronze Plate, Iron Plate, Tin Plate pattern: 111 000 222 quantity: 2 tools: Crafting Table - + item: Pahoehoe Lava - + item: Pahoehoe Lava Cell recipe: input: Empty Cell, Pahoehoe Lava pattern: ... .1. .0. - + item: Plutonium recipe: extras: 4 Tiny Pile of Plutonium, 6 Iron Dust @@ -1765,7 +1784,7 @@ group: Minerals input: Tiny Pile of Plutonium pattern: 000 000 000 tools: Crafting Table - + item: Refined Iron Ingot recipe: extras: Slag, Empty Cell @@ -1796,21 +1815,21 @@ group: Minerals input: Refined Iron Block pattern: ... .0. ... quantity: 9 - + item: Scrap - + item: Scrap Box recipe: input: Scrap pattern: 000 000 000 tools: Crafting Table - + item: Silicon Dioxide recipe: input: Clay Dust pattern: 00. 00. ... tools: Thermal Centrifuge - + item: Silver Ingot recipe: input: Silver Dust, furnace fuel @@ -1824,7 +1843,7 @@ group: Minerals input: Crushed Silver Ore, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Slag recipe: extras: Reinforced Iron Ingot, Empty Cell @@ -1851,23 +1870,23 @@ group: Minerals input: Compressed Air Cell, Purified Crushed Iron Ore pattern: ... .1. .0. tools: Blast Furnace - + item: Steam - + item: Steam Cell recipe: input: Empty Cell, Steam pattern: ... .1. .0. - + item: Sticky Resin - + item: Superheated Steam - + item: Superheated Steam Cell recipe: input: Empty Cell, Superheated Steam pattern: ... .1. .0. - + item: Tin Block recipe: input: Tin Ingot @@ -1877,7 +1896,7 @@ group: Minerals input: Tin Ingot pattern: 000 000 000 tools: Compressor - + item: Tin Ingot recipe: input: Tin Ore, furnace fuel @@ -1899,15 +1918,15 @@ group: Minerals input: Tin Block pattern: ... .0. ... quantity: 9 - + item: Tin Ore - + item: Universal Fluid Cell recipe: input: Glass Pane, Tin Item Casing pattern: .1. 101 .1. tools: Crafting Table - + item: Uranium 235 recipe: input: Tiny Pile of Uranium 235 @@ -1917,7 +1936,7 @@ group: Minerals input: Tiny Pile of Uranium 235 pattern: 000 000 000 tools: Compressor - + item: Uranium 238 recipe: extras: 2 Tiny Pile of Uranium @@ -1953,27 +1972,27 @@ group: Minerals input: Uranium Block pattern: ... .0. ... quantity: 9 - + item: Uranium Block recipe: input: Uranium 238 pattern: 000 000 000 tools: Crafting Table - + item: Uranium Ore - + item: UU-Matter - + item: UuMatter Cell recipe: input: Empty Cell, UU-Matter pattern: ... .1. .0. - + item: Water Cell recipe: input: Empty Cell, Water pattern: ... .1. .0. - + group: Minerals: Dusts item: Bronze Dust @@ -1993,14 +2012,14 @@ group: Minerals: Dusts input: Tiny Pile of Bronze Dust pattern: 000 000 000 tools: Compressor - + item: Clay Dust recipe: input: Clay (Block) pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Coal Dust recipe: input: Coal @@ -2021,7 +2040,7 @@ group: Minerals: Dusts input: Hydrated Coal Dust, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Copper Dust recipe: extras: Tiny Pile of Tin Dust @@ -2045,62 +2064,62 @@ group: Minerals: Dusts input: Tiny Pile of Copper Dust pattern: 000 000 000 tools: Compressor - + item: Crushed Copper Ore recipe: input: Copper Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Gold Ore recipe: input: Gold Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Iron Ore recipe: input: Iron Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Lead Ore recipe: input: Lead Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Silver Ore recipe: input: Silver Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Tin Ore recipe: input: Tin Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Crushed Uranium Ore recipe: input: Uranium Ore pattern: ... .0. ... quantity: 2 tools: Macerator - + item: Diamond Dust recipe: input: Diamond pattern: ... .0. ... tools: Macerator - + item: Energium Dust recipe: input: Diamond Dust, Redstone @@ -2112,7 +2131,7 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 9 tools: Macerator - + item: Gold Dust recipe: extras: Tiny Pile of Silver Dust @@ -2136,14 +2155,14 @@ group: Minerals: Dusts input: Gold Ingot pattern: ... .0. ... tools: Macerator - + item: Hydrated Coal Dust recipe: input: Coal Dust, Water Bottle pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Iron Dust recipe: extras: Tiny Pile of Gold Dust @@ -2211,7 +2230,7 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 6 tools: Thermal Centrifuge - + item: Lapis Lazuli Dust recipe: input: Lapis Lazuli @@ -2230,7 +2249,7 @@ group: Minerals: Dusts input: Tiny Pile of Lapis Dust pattern: 000 000 000 tools: Compressor - + item: Lead Dust recipe: extras: Tiny Pile of Copper Dust @@ -2254,7 +2273,7 @@ group: Minerals: Dusts input: Tiny Pile of Lead Dust pattern: 000 000 000 tools: Compressor - + item: Lithium Dust recipe: input: Tiny Pile of Lithium Dust @@ -2264,7 +2283,7 @@ group: Minerals: Dusts input: Tiny Pile of Lithium Dust pattern: 000 000 000 tools: Compressor - + item: Obsidian Dust recipe: input: Obsidian @@ -2278,56 +2297,56 @@ group: Minerals: Dusts input: Tiny Pile of Obsidian Dust pattern: 000 000 000 tools: Compressor - + item: Purified Crushed Copper Ore recipe: extras: 2 Tiny Pile of Copper Dust, Stone Dust input: Crushed Copper Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Gold Ore recipe: extras: 2 Tiny Pile of Gold Dust, Stone Dust input: Crushed Gold Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Iron Ore recipe: extras: 2 Tiny Pile of Iron Dust, Stone Dust input: Crushed Iron Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Lead Ore recipe: extras: 3 Tiny Pile of Sulfur Dust, Stone Dust input: Crushed Lead Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Silver Ore recipe: extras: 2 Tiny Pile of Silver Dust, Stone Dust input: Crushed Silver Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Tin Ore recipe: extras: 2 Tiny Pile of Tin Dust, Stone Dust input: Crushed Tin Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Purified Crushed Uranium Ore recipe: extras: 2 Tiny Pile of Lead Dust, Stone Dust input: Crushed Uranium Ore, Water pattern: ... .0. .1. tools: Ore Washing Plant - + item: Silver Dust recipe: extras: Tiny Pile of Lead Dust @@ -2352,13 +2371,13 @@ group: Minerals: Dusts input: Tiny Pile of Silver Dust pattern: 000 000 000 tools: Compressor - + item: Stone Dust recipe: input: Cobblestone pattern: ... .0. ... tools: Thermal Centrifuge - + item: Sulfur Dust recipe: input: Gunpowder @@ -2372,7 +2391,7 @@ group: Minerals: Dusts input: Tiny Pile of Sulfur Dust pattern: 000 000 000 tools: Compressor - + item: Tin Dust recipe: extras: Tiny Pile of Iron Dust @@ -2400,14 +2419,14 @@ group: Minerals: Dusts input: Tin Can pattern: ... 00. ... tools: Macerator - + item: Tiny Pile of Bronze Dust recipe: input: Bronze Plate pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Copper Dust recipe: extras: Purified Crushed Copper Ore, Stone Dust @@ -2430,7 +2449,7 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Gold Dust recipe: extras: Purified Crushed Gold Ore, Stone Dust @@ -2458,7 +2477,7 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Iron Dust recipe: extras: Purified Crushed Iron Ore, Stone Dust @@ -2481,14 +2500,14 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Lapis Dust recipe: input: Lapis Lazuli Plate pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Lead Dust recipe: extras: Purified Crushed Uranium Ore, Stone Dust @@ -2506,20 +2525,20 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Lithium Dust recipe: input: Nether Quartz, Water pattern: .0. .0. .1. tools: Thermal Centrifuge - + item: Tiny Pile of Obsidian Dust recipe: input: Obsidian Plate pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Plutonium recipe: extras: 16 Uranium 238, 6 Iron Dust @@ -2559,7 +2578,7 @@ group: Minerals: Dusts input: Plutonium pattern: ... .0. ... quantity: 9 - + item: Tiny Pile of Silver Dust recipe: extras: Purified Crushed Silver Ore, Stone Dust @@ -2567,7 +2586,7 @@ group: Minerals: Dusts pattern: ... .0. .1. quantity: 2 tools: Ore Washing Plant - + item: Tiny Pile of Sulfur Dust recipe: extras: Purified Crushed Lead Ore, Stone Dust @@ -2575,7 +2594,7 @@ group: Minerals: Dusts pattern: ... .0. .1. quantity: 3 tools: Ore Washing Plant - + item: Tiny Pile of Tin Dust recipe: extras: Purified Crushed Tin Ore, Stone Dust @@ -2598,7 +2617,7 @@ group: Minerals: Dusts pattern: ... .0. ... quantity: 8 tools: Macerator - + item: Tiny Pile of Uranium 235 recipe: extras: 5 Uranium 238 @@ -2615,7 +2634,7 @@ group: Minerals: Dusts input: Uranium 235 pattern: ... .0. ... quantity: 9 - + group: Nuclear Reactor item: 10k Coolant Cell @@ -2623,296 +2642,296 @@ group: Nuclear Reactor input: Coolant Cell, Tin Plate pattern: .1. 101 .1. tools: Crafting Table - + item: 30k Coolant Cell recipe: input: 10k Coolant Cell, Tin Plate pattern: 111 000 111 tools: Crafting Table - + item: 60k Coolant Cell recipe: input: 30k Coolant Cell, Iron Plate, Tin Plate pattern: 202 212 202 tools: Crafting Table - + item: Advanced Heat Exchanger recipe: input: Copper Plate, Electronic Circuit, Heat Exchanger, Lapis Lazuli Plate pattern: 313 202 313 tools: Crafting Table - + item: Advanced Heat Vent recipe: input: Diamond, Heat Vent, Iron Bars pattern: 212 202 212 tools: Crafting Table - + item: Bottling Plant recipe: input: Basic Machine Casing, Electronic Circuit, Empty Cell pattern: .2. .2. 101 tools: Crafting Table - + item: Component Heat Exchanger recipe: input: Gold Plate, Heat Exchanger pattern: .0. 010 .0. - + item: Component Heat Vent recipe: input: Heat Vent, Iron Bars, Tin Plate pattern: 121 202 121 tools: Crafting Table - + item: Containment Box recipe: input: Chest, Lead Item Casing pattern: 111 101 111 tools: Crafting Table - + item: Containment Reactor Plating recipe: input: Advanced Alloy, Reactor Plating pattern: 10. 0.. ... - + item: Coolant Cell recipe: input: Empty Cell, IC2 Coolant pattern: ... .1. .0. - + item: Dual Fuel Rod (Depleted MOX) - + item: Dual Fuel Rod (Depleted Uranium) - + item: Dual Fuel Rod (MOX) recipe: input: Fuel Rod (MOX), Iron Plate pattern: ... 010 ... tools: Crafting Table - + item: Dual Fuel Rod (Uranium) recipe: input: Fuel Rod (Uranium), Iron Plate pattern: ... 010 ... tools: Crafting Table - + item: Enriched Uranium Nuclear Fuel recipe: input: Tiny Pile of Uranium 235, Uranium 238 pattern: 111 000 111 tools: Crafting Table - + item: Fuel Rod (Depleted MOX) - + item: Fuel Rod (Depleted Uranium) - + item: Fuel Rod (Empty) recipe: input: Iron Plate pattern: ... .0. ... tools: Metal Former - + item: Fuel Rod (Lithium) - + item: Fuel Rod (MOX) recipe: input: Fuel Rod (Empty), MOX Nuclear Fuel pattern: ... 1.0 ... tools: Canning Machine - + item: Fuel Rod (Tritium) - + item: Fuel Rod (Uranium) recipe: input: Enriched Uranium Nuclear Fuel, Fuel Rod (Empty) pattern: ... 0.1 ... tools: Canning Machine - + item: Heat-Capacity Reactor Plating recipe: input: Copper Plate, Reactor Plating pattern: 000 010 000 tools: Crafting Table - + item: Heat Conductor recipe: input: Copper Plate, Rubber pattern: 101 101 101 tools: Crafting Table - + item: Heat Exchanger recipe: input: Copper Plate, Electronic Circuit, Tin Plate pattern: 010 202 020 tools: Crafting Table - + item: Heat Vent recipe: input: Electric Motor, Iron Bars, Iron Plate pattern: 121 202 121 tools: Crafting Table - + item: Hot Coolant Cell recipe: input: Empty Cell, IC2 Hot Coolant pattern: ... .1. .0. - + item: IC2 Coolant - + item: IC2 Hot Coolant - + item: Liquid Heat Exchanger recipe: input: Empty Cell, Glass, Heat Conductor, Iron Item Casing pattern: 101 101 323 tools: Crafting Table - + item: LZH-Condensator recipe: input: Lapis Lazuli Block, RSH-Condensator, Reactor Heat Exchanger, Reactor Heat Vent, Redstone pattern: 434 101 424 tools: Crafting Table - + item: MOX Nuclear Fuel recipe: input: Plutonium, Uranium 238 pattern: 111 000 111 tools: Crafting Table - + item: Neutron Reflector recipe: input: Coal Dust, Copper Plate, Tin Dust pattern: 202 010 202 tools: Crafting Table - + item: Nuclear Reactor recipe: input: Advanced Circuit, Dense Lead Plate, Generator, Reactor Chamber pattern: 101 333 121 tools: Crafting Table - + item: Nuke recipe: input: Advanced Circuit, Advanced Machine Casing, Thick Neutron Reflector pattern: 202 212 202 tools: Crafting Table - + item: Overclocked Heat Vent recipe: input: Gold Plate, Reactor Heat Vent pattern: .0. 010 .0. tools: Crafting Table - + item: Pellets of RTG Fuel recipe: input: Dense Iron Plate, Plutonium pattern: 000 111 000 tools: Crafting Table - + item: Quad Fuel Rod (Depleted MOX) - + item: Quad Fuel Rod (Depleted Uranium) - + item: Quad Fuel Rod (MOX) recipe: input: Copper Plate, Fuel Rod (MOX), Iron Plate pattern: 121 020 121 tools: Crafting Table - + item: Quad Fuel Rod (Uranium) recipe: input: Copper Plate, Fuel Rod (Uranium), Iron Plate pattern: 121 020 121 tools: Crafting Table - + item: Reactor Access Hatch recipe: input: Reactor Pressure Vessel, Trapdoor pattern: 000 010 000 tools: Crafting Table - + item: Reactor Chamber recipe: input: Basic Machine Casing, Lead Plate pattern: .1. 101 .1. tools: Crafting Table - + item: Reactor Fluid Port recipe: input: Reactor Pressure Vessel, Universal Fluid Cell pattern: 000 010 000 tools: Crafting Table - + item: Reactor Heat Exchanger recipe: input: Copper Plate, Heat Exchanger pattern: 000 010 000 tools: Crafting Table - + item: Reactor Heat Vent recipe: input: Copper Plate, Heat Vent pattern: 000 010 000 tools: Crafting Table - + item: Reactor Plating recipe: input: Advanced Alloy, Lead Plate pattern: ... 10. ... - + item: Reactor Pressure Vessel recipe: input: Lead Plate, Stone pattern: 101 010 101 quantity: 4 tools: Crafting Table - + item: Reactor Redstone Port recipe: input: Reactor Pressure Vessel, Redstone pattern: 000 010 000 tools: Crafting Table - + item: Recycler recipe: input: Compressor, Dirt, Glowstone Dust, Iron Ingot pattern: .2. 101 313 tools: Crafting Table - + item: Reinforced Construction Foam - + item: Reinforced Door recipe: input: Iron Plate, Lead Plate pattern: 010 010 010 tools: Crafting Table - + item: Reinforced Glass recipe: input: Advanced Alloy, Glass pattern: 101 111 101 quantity: 7 tools: Crafting Table - + item: Reinforced Stone recipe: input: Construction Foam, Iron Scaffold pattern: ... .0. .1. tools: CF Sprayer - + item: RSH-Condensator recipe: input: Heat Exchanger, Heat Vent, Redstone pattern: 222 212 202 tools: Crafting Table - + item: Thick Neutron Reflector recipe: input: Copper Plate, Neutron Reflector pattern: 010 101 010 tools: Crafting Table - + group: Tools item: Bronze Axe @@ -2920,57 +2939,57 @@ group: Tools input: Bronze Ingot, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Bronze Hoe recipe: input: Bronze Ingot, Stick pattern: 00. .1. .1. tools: Crafting Table - + item: Bronze Pickaxe recipe: input: Bronze Ingot, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Bronze Shovel recipe: input: Bronze Ingot, Stick pattern: .0. .1. .1. tools: Crafting Table - + item: Bronze Sword recipe: input: Bronze Ingot, Stick pattern: .0. .0. .1. tools: Crafting Table - + item: Carbon Fiber Canoe recipe: input: Carbon Plate pattern: ... 0.0 000 tools: Crafting Table - + item: CF Sprayer recipe: input: Iron Item Casing, Universal Fluid Cell pattern: 0.. .0. .10 tools: Crafting Table - + item: Cutter recipe: input: Iron Ingot, Iron Plate pattern: 1.1 .1. 0.0 tools: Crafting Table - + item: Damaged Rubber Dinghy - + item: Dynamite recipe: input: String, TNT pattern: ... 10. ... quantity: 8 - + item: Dynamite-O-Mote recipe: input: Electronic Circuit, Glowstone Dust, Insulated Copper Cable, TNT @@ -2980,105 +2999,105 @@ group: Tools input: Frequency Transmitter, Insulated Copper Cable, Lapis Lazuli Dust, Tin Item Casing pattern: .1. 323 .0. tools: Crafting Table - + item: EU-Reader recipe: input: Electronic Circuit, Glowstone Dust, Insulated Copper Cable pattern: .1. 202 2.2 tools: Crafting Table - + item: Forge Hammer recipe: input: Iron Ingot, Stick pattern: 00. 011 00. tools: Crafting Table - + item: Frequency Transmitter recipe: input: Electronic Circuit, Insulated Copper Cable pattern: ... 01. ... - + item: Lathing Tool recipe: input: Iron Item Casing, Refined Iron Plate pattern: 1.. .0. ..0 tools: Crafting Table - + item: Obscurator recipe: input: Advanced Circuit, Advanced RE-Battery, Insulated Gold Cable, Redstone pattern: 313 202 333 tools: Crafting Table - + item: OD Scanner recipe: input: Advanced RE-Battery, Electronic Circuit, Glowstone Dust, Gold Item Casing, Insulated Copper Cable pattern: 323 101 444 tools: Crafting Table - + item: OV Scanner recipe: input: Advanced Circuit, Energy Crystal, Glowstone Dust, Gold Item Casing, Insulated Gold Cable, OD Scanner pattern: 313 202 454 tools: Crafting Table - + item: Rubber Dinghy recipe: input: Rubber pattern: ... 0.0 000 tools: Crafting Table - + item: Rubber Sheet recipe: input: Rubber pattern: ... 000 000 quantity: 3 tools: Crafting Table - + item: Scaffold recipe: input: Oak Wood Planks, Stick pattern: 000 .1. 1.1 quantity: 4 tools: Crafting Table - + item: Sticky Dynamite recipe: input: Dynamite, Sticky Resin pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Tool Box recipe: input: Bronze Item Casing, Chest pattern: ... 010 000 tools: Crafting Table - + item: Treetap recipe: input: Oak Wood Planks pattern: .0. 000 0.. tools: Crafting Table - + item: Weeding Trowel recipe: input: Iron Ingot, Rubber pattern: 0.0 .0. 101 tools: Crafting Table - + item: Windmeter recipe: input: Bronze Item Casing, Small Power Unit, Tin Item Casing pattern: .2. 202 .21 tools: Crafting Table - + item: Wrench recipe: input: Bronze Ingot pattern: 0.0 000 .0. tools: Crafting Table - + group: Tools: Electric item: Chainsaw @@ -3086,144 +3105,144 @@ group: Tools: Electric input: Iron Plate, Power Unit pattern: .00 000 10. tools: Crafting Table - + item: Diamond Drill recipe: input: Diamond, Iron Turning Blank, Mining Drill pattern: .0. 010 .2. tools: Crafting Table - + item: Electric Boat recipe: input: Insulated Copper Cable, Iron Plate, Water Mill pattern: 000 121 111 tools: Crafting Table - + item: Electric Hoe recipe: input: Iron Plate, Small Power Unit pattern: 00. .0. .1. tools: Crafting Table - + item: Electric Treetap recipe: input: Small Power Unit, Treetap pattern: ... 10. ... - + item: Electric Wrench recipe: input: Small Power Unit, Wrench pattern: ... 10. ... - + item: Iridium Drill recipe: input: Diamond Drill, Energy Crystal, Iridium Reinforced Plate pattern: .2. 202 .1. tools: Crafting Table - + item: Mining Drill recipe: input: Iron Plate, Power Unit pattern: .0. 000 010 tools: Crafting Table - + item: Mining Laser recipe: input: Advanced Alloy, Advanced Circuit, Energy Crystal, Iron Turning Blank, Redstone pattern: 442 001 .30 tools: Crafting Table - + item: Nano Saber recipe: input: Advanced Alloy, Carbon Plate, Energy Crystal, Glowstone Dust pattern: 30. 30. 121 tools: Crafting Table - + group: Tools: Painters item: Black Painter recipe: input: Ink Sac, Painter pattern: ... 10. ... - + item: Blue Painter recipe: input: Lapis Lazuli, Painter pattern: ... 10. ... - + item: Brown Painter recipe: input: Cocoa Beans, Painter pattern: ... 10. ... - + item: Cyan Painter recipe: input: Cyan Dye, Painter pattern: ... 10. ... - + item: Dark Grey Painter recipe: input: Gray Dye, Painter pattern: ... 10. ... - + item: Green Painter recipe: input: Cactus Green, Painter pattern: ... 10. ... - + item: Light Blue Painter recipe: input: Light Blue Dye, Painter pattern: ... 10. ... - + item: Light Grey Painter recipe: input: Light Gray Dye, Painter pattern: ... 10. ... - + item: Lime Painter recipe: input: Lime Dye, Painter pattern: ... 10. ... - + item: Magenta Painter recipe: input: Magenta Dye, Painter pattern: ... 10. ... - + item: Orange Painter recipe: input: Orange Dye, Painter pattern: ... 10. ... - + item: Painter recipe: input: Iron Ingot, Wool pattern: .11 .01 0.. tools: Crafting Table - + item: Pink Painter recipe: input: Painter, Pink Dye pattern: ... 01. ... - + item: Purple Painter recipe: input: Painter, Purple Dye pattern: ... 01. ... - + item: Red Painter recipe: input: Painter, Rose Red pattern: ... 01. ... - + item: White Painter recipe: input: Bone Meal, Painter pattern: ... 10. ... - + item: Yellow Painter recipe: input: Dandelion Yellow, Painter pattern: ... 10. ... - + diff --git a/src/data/minecraft/1.7.10/images/bottle_o_enchanting.png b/src/data/minecraft/1.7.10/images/bottle_o_enchanting.png index dc526ded21ceaeab5fb0f747d1fdeafa702d1f3b..aa8ad5aa8798f7f2620f42e5e55b571941c5c33c 100644 GIT binary patch delta 2249 zcmV;)2sZcE5Y-WoB!8SqL_t(|+U=S5SJY<~hx1Qu$;M>kTFAy|M5=|Vf&pn(ilQPS zN>w_c4rM4N8WY{sV~&XlOtXNpMibFU5euS3V?@Bue%|{n%oz435NFTHob#MHqs+{6 z?|a|-mU-)~KOTQPyzc>z#}(2=E)XZ_B;VoxC;&|u_=bE)u_BsP{tg$=@Rp`~G^w&EJ5c zkT{ftCZa5C3xD5#kz6MK!5jzB2LnT1Wq3N_gnw*A(t-qRUbq?C7HvaSL>g)$(^0#2 zmxu#B(sJKG00U68;_EhPB_J92a7hm)!iRpy5 zE#5AHZC$h#TNZ6WIRh;V+l5|?}E}%SotC?Z<>`qB1d55%T04{yA=6EH$4pX!=G|6NtfKG1-z&+E`iE059 zhbG`~NPjF}pCxC=zr7`ZNf@|idYl;^!#Vs$;r!L>k-I7a2ZKZTcgMB;&}6%}1u!ld zE?l!ggr6|Oqd0*_6wcymof+Vd41Zt#StIbGp456v08c4DN*+pvvx8QP@B?P}-b4$A zD7=0|8?-I@NEo^Jv1reN$Lvc!0uv6o0f8aUL}5STPIz zUdyoR6vm`8YFKrXUm4(2*8UR)n`GUC#OB>dXii5!&K{i%tZy#Fdg~!_7=NX<9Fi;C zWrpugD4IF4%gD!q)>;*!B@}HT#QT%|%JlH6dctZ0o2_i6e zFUdp@iLw?6(bi&=+4D#~%E>)`j^aLrL;tp%_#%u*H{w=g#v49WI$8O#!d{39M7eRUZNwyHvQjC~ZMF|(X z0WwJLFo1U4r>w&LPRY1Oo$+1j)Yu z5GzS+YbhyXXDZ`d84{jyNqfKyYkV#ZB2oyFYe$V^voQjS>mFTVkdy9?V5Rt8>FW)S zOeC}xAW`LV2+iV;q_k$*`=D~>w$ku0(wrH*>8z!o8{t=2>>aEcN#$r3VnMA64O>*lRO z)Vm>welHAD_fBVL8o&)`^dcj`m#knXT7gHLbdOlSkI6A-w(y1X0JjbeI*k;s<0@Py zD{+a-z{2%nP=J)u368|SxOX}&SCJd%M6b=ec>3!rFD@ zCb>`2u4=l483v#ZEw=^F>vHWHU7f^6S;M2yIKj=@Nu4HF4Xo$u(Q=_dKXR(0=QFCG zaN^s_4IgVUv#b;gZ zINGK5OB3X!2tC6E{KgDFXLb$YWFb| z|IDx<>_R0sbB1uY{)>wmsc)whHZrV@;(2cgzz{y8Pw?aV@4&wo)_zCmf^k%x$@l&j XfJverv*W@400000NkvXXu0mjfXr4^T delta 2122 zcmV-Q2(|as5!VoqB!3=BL_t(|+U=N$S5wy-#rsFqI>-0B9sM7=IOu$?*hCO(bD@G8HqE>3^7codFv+&`#p76SpM6 zZ(nB;S(tq-!|YVHtsCeh@pp-@CBbu?9L!JWVqrQDHYi#U40PeN<3|YLY=-Omo8k8U z$AlfuIemh2&Y$AE^Jl;tIWSX16vIXgbd&fVq8DeK?1(K~u=~1C;IZyg>{<62LS44v zg3C69xoijCmVXjuM7gaP=qK?5#2~M5sPn(L;JqJgh35y`;JJP~!d>kV;p%`0x1GRj z1yKpiRpT!dEeHmNB*Co0qF}G}JK(+E9^M-quy4ao_-xn(pN)?2+vtpo9&U);>M7ixol)IBv!GW8-5wzI{hd=hi5j%gRc?Tk6-y!0#spWS3 z1qMtR#@v?{k+3HCs9gYpw*(P~ID&WqL3}%BZ4E4Z1uR_U88(lEHNnEqi=^*cL=fM` zS>p()_mPx1 z?;xqd=0ekK+rXa-wQ&P4A!07{H3<|+GmXk(v^sbT{Tmo)=ZKR$llT4`#7&OP84xEh z6Ffx~p61*@md{ZW$LM{xC2T^LPCxk+9EtBv5aT*H}>8% z?*OEF9iY#vO*=TnT0aNI=}RX#nLbCP3Qy2ZY?6dBnD7p50osT1@grI>M$e2NNN}R3 z4-)ozA&xEP=Ie->wO^Tnk}WU=nNKiezQO#?s{e{6=x-#rWk80efefho)9{!oJW5aQ zhkqnE#={lSv~G%Wb0pzc$UrUFlYNauPZ86SU{?JXB={E+{G6{We%Y9mEN zfu|&B4&UP~)q4gHA?wOTc6UBCUxU+E>u~03J@SWIaY@^b0&NFW+7hUAWl-zNVSXTx=XVnM`@bMg zLD;4WEYrYa`X{5r1KMTnhVMovzG3;9GW?7p^PF!9e57Zw8s`$rh)J1pFAR-@DUI< zEH5a-zfp!?@=5m+LR+0gnO2E%Z6nHcYFud0AgrMYVajF{4|k$u_%2HCeT|lTSI~OD z25rRRfxrM4F0z6K#-s|Tc==0{PR#H)pLDDgWhD}nRrox=27f0m)e?1x zRJ9?>gyOzh!dz&`)({EvLxW`+cp+6-d|A>JV*xq}EdjA__`~Dj_zMmtAbpj2msp@77kRgV zYxqy00w)WVh}B$2oaQFtHMf=+cmSbMj3UY*0g(>zM4aih?^a?2V1H&{u}fGtP>TdL zE!NacNYXUplw6I|at%U?nvmGkiKOPcNN(<0Vt`fpAs5Rk&qg5JKE@OuBOjSnF<{;$ zy1uDL_sCWBj3}TO=|h9QA4>fo3GO4o14wQegwm)*qfy82e;k2tx!5p@P}q(rngfy2 zp&5I91r3}<;em6IAAbn7=n{Q;CHnO$3>ef<8FWw?hoLs!M{0`>DJ@!J2o1(T0mHx& z0|t}O5iUH;G!KN4VGq&oSI$83!Elruj6i8Xq(zq)G&W<%*b1$&jSE*B?{O2X@@xc> zn){(J^x+yq-@C+s(KHI9h~Alqm|e-ZxGUA{>Hd7>448L`ihrO4R0bvTyO?2y&d>s_ zp_ynxhv6XhUaxLDyVg}5+#N{9pfw5AC8AEyv z2K8z}#f38yHw;TB?o+A4qTm$gOGtGtM5>D%X)Z;pW5B#iln2J3j1dqmWtiQEsPb$S zhK=pG{cS()JbxHO=Yypa_gCrZE(%U}DMq?$F*00BiL#Y5U}?r^G3mrE!A5~asp?P? zst>2&%HcHB9LcnZ#L^0jg5Pzm(uPKFG3mrEAquWND#KStb5MUQ57&YVtO^z@oat7M zEVs*RZ9ougo?+G{M8S$+ITXj`XgFRBg!Ucmo*E$4fG2UuDX;H#mS{Qv*}07*qoM6N<$g5`As A4*&oF diff --git a/src/data/minecraft/1.7.10/images/button.png b/src/data/minecraft/1.7.10/images/button.png new file mode 100644 index 0000000000000000000000000000000000000000..0a59c43d082ee5ddb8623bcd02618f98e0b62e1c GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtQ=Tr4Ar-gYPF3V~B9Yoz2!6QI|GJT;rAR%|j-PKurt`2jq)ludkgF^v++*{`}^p z*KP@K+o7Lnoj0+=_H)wdO-BSR`xcAKb^qR;uy=LThkN4E6cdAmEz9_dg}E3Ure%2P@YKitJEwcCz1OF06OPlAHe@EAS!3zw za@KF}@3sx^z4z2hMV*u#&rIkGjW^b?TPykq7-=p-I|KEy-6-8Kl^Ie<5s>^Wvy3GCc_B|I$ z+mx=Y+}pQsV}FRKr&xztTzTsH+kYvU2s-g-g-U}bHe0)SR}v-3R#03|#D zLWNr0e1Aj%;MScT3IJNbzT7~P3Q(Dxp<0d>Qmo1}gfHwI{ENDAt4$#vWP(uPy;fyh zvTol08^xUoJE4VPWeQ;#ufB4vH(N}4`ts=jFg{*u7{vJG0Lmc%+`O|+ZFgQ!F#GjFi+_sqp*LHgc_`z|_ZNqM48R-(fO73p zGCpzH%A-uitF*rT+$xZOU=G(IyjLrJ<5r8>+I?Yh{pGh!TYc>!RvLx@fX8~C3Q%>X zr=~wOfQhO3WOQtj08ptqeW+>(1}0b6pHfOf04RyMqEUE308rilK;N6q51Qd@{~%Xh z&wuf_IQa3K0WOT!32ju^p<{D=L#K(vT7q5`Y8%yvIVy?M{yaO5XtoFj1eUU=XJ9o4etX z8WKQl>T1%M|NIbO=jkg70L|7zD(=iM1oKcgJp5yX48jQJ6;gQriQaw+0Qj8>Ab-;U z5RA%d$z2D4o(n+FwL@d>d(=l(-GmC^<}m2PAWsRPFI>+CIITE9GFfk$q1Jy4z}X8` zGXgc{zp&kaN|kON;C;vgKp0?1asWVh{G0brc=H4pW>^Ry6XM#3QX$m(Zb$(j-XXr% z0i^>>%q15}T>zMxn4Tj*ZStxI34ckA9Rh#>1^|VW0J>$-1H^Sbt}=M7x36H~bdoDy zFc_BDGyv3k+!z25!o>il=eWu=3)4XNlOHERHs+7)lky^frT%PJNC0NNn|Wxon)PT{k@tM%Ir!QaQ zjbT2M?UurL#hDwR8Z(D4B0E>0xBA1xCAnh3jq=z6GBLN$gGdnPJnt$?h&>5PC@&hBG zKX?Fj@AO9I0M7j3B4s0mi+hMo&Fx6N@h9Ie#{Dh;0J3HmLI}HovZy|wrUmm5tBM1p zd1tUNaGC(BLIUW9l>c-i)D}M(7g;^?qKMTwd02*_>0041Pvsr}|27rb-0r;~-IMG#S+)8K7 zpk^F}g#hAC%ewD&MWGiDd)Ptb#2Wz`bJxubXPQ!XkOP44uCoRpqm~m@f10ziLjX_+ zSj`VWSyx$NfPC>I_5qk@ZVZ2H%}ZlNCan_#pcXZ#sm8nklz(l!o=xhP{z%C<-Us=! z#H<0}yA%TK2Zd9IMhO9^OadSqjn96h@H>}@hP%`wr2wE$&W&4Qmcm%Aa{?ip>6+`d z0`R*M?SShcivL3)6a*kYS`1l}I|`6ww?1(04Rm&6Ti`oN5jNwBees- zOr*m<0Mr)*@PEOF8A<>+WkCRl4da@gYj_g?3IIYV6#yaNPi4^wtTKJ*Obh@S)Q&Xf zt{DJ6r`IPP9Oiccy#L!?8l%y?LTiwD0^vGJsbby(jLD(Y-TVI!`n&|1+VEjPV!dfBo+- bZ}|B)8dS*HEEz67m6%BYyz7Nkl^l8-2dkQscCgN(Te*4?ukI{qZgp zn^qMu3I^bm05#tV5U;B<*V|mGItD;iz%K>h^Z;k>o!6*3A5fdFf&q{T5O3Hp_ RdME$@002ovPDHLkV1k`QT8jVx diff --git a/src/data/minecraft/1.7.10/images/clock.png b/src/data/minecraft/1.7.10/images/clock.png index 9b322b12967dc0d1ff041361b8d234e335d33fca..0df278e0c2da9fbf6a80c2de357815cdcaefa8ab 100644 GIT binary patch delta 301 zcmV+|0n+}?0>}c8B!3S{L_t(|+U?mb4ue1t1z>zd9YK(KG_D#`-Gnn#w1$)PAQe3U zC*S~8B%Fl0$%wvWCj9Jf`beIG+4l*u8_2SiuBJK8o@B9I1cWX+j!##D!3YQeuoOLC zU#?hS1SAbWrM*Q_iah_BX__R9Fa)FqxZFOjoXS$70eY>vK7U9ENCIFfJq(#-o`1(u z8U?)%CJX_w0(5Bt2-x8r&K#&Xtg+lRz*m~-#S1cV0Yn@|b80Lm86 z5|A9A>k5hYqt#l`9SBGcfClYZ`hBk?1SA3QVwS+roJFMxhzWo&de`jxN`eZZ=w~-6 zO+ZWlgwfH3EG9v7HvdaWKxlv$7F|&SRt9_l(+ed?OF9>A00000NkvXXu0mjf=C6A} delta 307 zcmV-30nGl$0?q=EB!3l2L_t(|+U?mZ4#Gebh2ilCTvO5DtLxA;Xp*i0QA~G%V<8Au z&=qt6s3u)WaW_Zw(wX!zGvqY+9Zb(Bcm#}D=_Z;a=3osq_IIs*O@fCp)Bsfg6R>mxu*!xIn%03W1{ zz#C|7@mvC;12j!4x&COiR=9zH=m6S5dyanBxkNw|09VWsn0C&h(FBA9&@lL^*|xc) z4bsBrZZevHkSqWi2E#!%Y3FSIFC_uK0j{v%h7zzc;0tWP*>+%+C|Cdh002ovPDHLk FV1jcAh`ay* diff --git a/src/data/minecraft/1.7.10/images/compass.png b/src/data/minecraft/1.7.10/images/compass.png index b620e3da3626c94d8ba27e48637bd123d340b47c..308bcab00adb4df63cd15dedb4e9d5c739402202 100644 GIT binary patch delta 233 zcmV3Mh$6+UK*>O`2dmNFP`S=>5li8) z#TorC{W9PuMG8rd13?hPZF0_+MgiC!AZ=Vqp|;k3t~m^V6#!{a-jtF`Ii~kcox%XH z0w4`7ZG44rTMO7byr=-U0E}+-IZvtu27v7WPcXGsDgfI9Vq%O`t^0Tsz-Iu!9e_Ut z`9c;jX?=bg0KheXpV6PdMk~E<0N@V5!!M8kGc_3+fPVr=7+x)aw7%MxIRI7zMq#5} j_J06?)c^!Rkm-B@T8f?ACgW^%00000NkvXXu0mjf#wB19 delta 237 zcmV~S0+Ma&pO>cS8( z1E7tL8tQ>P(?d$Y5`d@?tu?9V90L9dfTPcpq#g_b%K>uEQfBMTaP({6rPgzB0|Cnc z@F|D~U4bFMIuwg<0|YD$z<2a3Fl)8n8w4x|z~BWMz|&hs6Yxy{4TFsWXy=FhGe^K| nfE8x#wC@81%my$F!?^PX&>orx17H7k00000NkvXXu0mjfM+s#7 diff --git a/src/data/minecraft/1.7.10/images/enchanted_book.png b/src/data/minecraft/1.7.10/images/enchanted_book.png index 8a8e493796e49cf4071dfc2c2f4851f64a054bc3..9c39238b7302833b39ed7501a8d861dab2ab304c 100644 GIT binary patch delta 2949 zcmV;03wrds7K|5=B!5#$L_t(|+U=S7SCeNJ$N6t&Mx^cwAUg?RCmSJNqph$J-jsT{lYgsGkrY5ft{-(d9@J#J zu%H9joL`Hkyec%3usyL7)&vJk@mBb=EbvN=@JI{`JAektaIMUaY7*A3F+jIk$6?|E z3qsVH^W zkzdO2o0W}RxI^8DuHwz;(X@)f$AW|Wc`VS6(Lf(+GJl&An({JsDJ*;K>XdX9c=naG50 z5LfiOam}z7SMv{JvS0{Pg-3CF?S9O}AH>~+x1&lz5bo18W;jx8G#%X7s`62@1)n-4BAX7WA5tHDK%Br2 z>xS?{;=A}h@f{%fIFNLV7>^PawcSpE@NXn-0nE6Yp{1dsO>(6W+p|gf~fi zOe8YHkO9BC?8Q{}Lv7Dfk9Em@B` zX(Jl4He+X5J9g#mPFNQrGP{DXkm1dWAQxsCe%g<~XDmZ6r<7w(DugMifTLI?gPfCvm<^Qq^;yld0)Lxu zgd~Saa)_j!WlBUM2v5f!z^%3WaAVDDm|DFDSMuM&MD9Uc%-J7R5zJHayim$VF;a}2$sFH}xuvez!cw`DuxQCD2Z1<8?Q!Lf`(QgrvUHR8+^S?|I>lLW?)W`?e*6y39-9$`S?PQ_HidtTeSe2jqu08kR0q?nh_bUkx1>z@y93~&kGEpGq_-y%zs5b9+{xO5u=yUK`YS7c@r_- zyh3nt3&Nsm4sJnY;`9St;>@B^q2ljjt1_SP9-E7w&R(;7cz@prHS9^J75<1;;6o~% z5ADEFdOk`49jW4RbZubjXrdXT8EZm16rvs<`ZVH*L!VlenP8EGw^BRqN#!pEWim0Z<^9t{=x_Dr0wC=Q6=_*&lN24uS1^iVv z$FM2H5i>ra6*$G2;Nq|2Ao215_WCdk(Hp~NRXd0!o zJ7ak_zLNA40~|q^;Y=;zpTl6E=}Kdi!Ja{%n^8h&pMEyTUZh4&tOmKUTAtxynrPi3fwBeRs_%q)9)00oQnVB{|@LuZLo%&;(8h4IRknbm5uN-H7=+fr17ny-RA zrI_CTGp5cyBEd(%itS-~Nqi^1mF~i~blGt|oPQLCAj~$j(56<-VdBnA9p{;jl!Z%F zC|III{ws14)X_drM!lhp8nvvcBb!bjvLu8WW}IKtjPtRK%@hQk=vE96gHggRNtuXz zX(>lR{OU7tZd?I!;_^65e3P=2f+*!pEij+(R0OOfJ{_MTuG8jp9T#G^5G}Y!g!YFW z{D1b0kY#oW;gV3&*SD{&@p9^4Seql~TNt_=rIAZpEd=ZJf}(rO*vB4~esV!joY_g;Y<_Y7j~iS1mK3c)98K-6JYbQldPWL3>1z zo-lBDU)%|CnrHb&lrUp1yXE+I_UoMU#DB!%c1*;DC|;q1Cd_lW8)r;bgJDXhomyT_ z80oUwD9SSg;WNi>M=;IHLdfv>oIi)zhs$vtoGWo%C|zkn*(wY4tL@Jx029r2Glwqf z>c52o^I<`?Y2&BE7STmW904qj_UQ zK;l7(jYOTIaBY?kb+P~&WYu)atA0c2@*s38YG7Ddk7@aS%*YRL7R2vj+Ld-{J{NSW zD^b4M3)7ka)p8Z8GV4$yS&v%j#)bV0q>+S8By5SVg*~AGj>HXcCN`o@x`|UyEa(92 vB00000NkvXXu0mjf8F-U! delta 2868 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 AiU0rr diff --git a/src/data/minecraft/1.7.10/images/furnace_2.png b/src/data/minecraft/1.7.10/images/furnace_2.png deleted file mode 100644 index 60ecd9bd81b4e59b40afad0297d98fd71fd6894d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1992 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 T2-^ve00000NkvXXu0mjffw^E< literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wk0|S#mW=KRygs+cPa(=E}VoH8es$NBI0Z=sqgH44MkeQoWlBiITo0C^; zRbi_HR$&EXgM{^!6u?SKvTcKWVUqbou<)&^v% zm2-Y>K~ZWkNQ<4RjXs7Ly86hV)Z+Y{Qcxh+nHxbhAPb^vh`^=+SrDqhMjsTWNMQ_# zK(Ht<2JN_jeu1S1J1*aSTYG?s>xrj}V@L+;+X%&Vha3d%{{I}x%GS8@J!jY90%pDg zj2C1UvBh_;SoMg_)FNwxuZIDLh)}^_-K0-WWt(=tQJ?QAb~yP{*>2l=Qs%+YO`^(dA@H*lKjr5=m(#meo<9UzyiX`Oek z?M2*_)R|$v@4VKi+OzVvGrNBH@aUbr%e#gO)+6c%qBv3?8QfyC7W(x4x9#6OF?ubv zR{Xw~7(a4#_#Zg!q_I>xPDjk-$k%_)%+?BVj2}5S=zrA^PO7>2oX_-0aV&@B>#wuw zZpp+!&3kaQb=4{*)8&^n6Im)M6925<0J7!5oz{S=KkU+v*WK9q`N5yKY6f+qhmSw5 zU~6W)*mhVkQU1d=mS1OYZ(Fx~U%UGkdBm>2e*F8}vg#w}pKm_@>+p>L#`|1< Zm^w77)*p##J_ITeJYD@<);T3K0RTl7vkw3O diff --git a/src/data/minecraft/1.7.10/images/monster_spawner.png b/src/data/minecraft/1.7.10/images/monster_spawner.png index cce393586b976ded6ab01e519a66a03238cb141f..2dc2a3f16691fdd2f8b6a453a8cb4a45e8d7fdea 100644 GIT binary patch delta 1643 zcmV-x29)`_4Ezj`B!5FmL_t(|+U=QbZ{kK2h56F(VvI2uV_*phyPIg+G}~RNQd_D2 z|7T6-Tzn?im$5OcBvqv%9bpV%&olRB?y!S_d5lIQH=E7edcAfFG(t z*Q?b^wApM#gZF;Ge3B#rVU5G+cDoIRt$9F0i^W3BXIbXf4}af8?+QTxh~~6mZ5)7U znu=Kpe-Gh$`}l2;et2}-`v=jxMPa#I2I*+nsK7jgRfh$zh~_DsKKdT(0rxdH zOlz3(^KTA%6Mu;5blNZr5I|V~t~ftK7^ILkF95y?Om`3N@cd_hU{s)2kAgPOC@{zI zjI=?NG=NSw7Ca*Y00;m!wV=i3)VMN$5o^OnTv zbw8Qqt`i{N9bLYvT(P?o#lGCu0!_gXi(ID=fOMKg_le_U7(4X8dHnM1pxk?#F4o-u zVt#WN0DnN_Uw5UH1;FN~yOv#bN@gUrPe1^;{q+x#{1U>`tJF{};(rg@JPs())hR0Hrn0LF`rn{V#i-PgZF8Ug?s zB-X8P52H5E4FH4rn-qr2u-aU4S@m@8AONJrre_M(H2||VBDlxnmM253v z2Y&$5#@4{?X8{P&un@JD`%j_RtH9dI7b!QFK zs~MgZ07S#H>L3aL_2&SvxxGLAZGCV-6p&twgf=}jD+~aihb$x-0Si#eW)@6uTDybf3-sJauXb!1n$m6A=Q~6^Ci) z1klWXZ5s8#>z}510O|!G5Vauyv_XW_+MZHJ#*zBH%txuQx=e$-45?zxqswr`S>P~F z0Hj&_?630Nw#@)w)5$;qVC44-hyWoa)aKNT$V=J~K);83X${*Mfi3{)KqkkFI)BB^ zYQR4O04X${&YJlg$#q*Jwq9UfzjxI>&{o6&z?;Ml9g7Iwk98eh&+;N#-1eS@dmR8( zr~nWMyMIIg^l%1%wjyqf5`KV#E&`1GcHWxjZ2ALQUpNQFJ3~0nicA`+)A>U4KQ~*pbzWvwJ}R=!}2>)H|vGuvo7E80A%CAk-aY zm@cjY!29EQ(fE#DH2?s;3untx)CZv8-_`H66>%4U-g&Pp;(C}{_)3V%RL8%6P6 z9Olq92+){FBV9-UFg~n0B7(`)PL(>>(=0kx+mzw?;Nmcs)bo!Ntm!6Q`+x@Q0}#e% z57631vpf_s%u6x%ssY<|^cgt@p`w(oZ_m!sdUf?G;`JQAK17B&m?r@4!8{}z;e65k z>s;%hUaxe=Fo(~TzFr^#P=9hv>@m#2JT^SOmn{khb*_Hv>CBq$Im`h7d&$i>Q3vv> z*D#0A>5&8GfB08wIqOzCQFNFqPh)d5BK{gh8VoPj(PN@5;^D-fqrI+L@kI5&+)q|74PRUY>YUXJ=$H z%)vYX8Y}KQ%EjLP)(-(tsUxk_409861`aEJsU^PWgAnC*->3onl4cL}|LTfgdI*4O pwE)mXJNU0W*nYX{ga04#$3Iq%B!ojfbr%2t002ovPDHLkV1fYL7wZ53 delta 1577 zcmV+^2G;rf47v=EB!2-(L_t(|+U=U#PUA=rhPhcziQ_nN948?O$Ap7`8D?j-2kmM# z4*-ia^OU><_Xr8NLE>U~lwSXpuBP1Sb{quEj5LvcC9!k(zv`;$a$sTM=gocV?SE8I zd-R_4!x-N^{#8LR-yOeSfP%HL>TZlk-+jc{G#;nJZ4v?KEzd{1lpSV3GHQ=sz}yZjLI z*z@6hY-9J(oPT(DP!|^$>hkhZot>Sj&!4|2U&M<(6V1TorOFIRZphH0=0LDJaUkRU7SM05abhE&za(J@>6heYj8JFS@(CBjZS+ z>+5SWj~d}7;45NN>=}Rz3V&A+r(_HS8>`?uA+7o=HufdnWsT+ zutnPb@PCi9&AL)3OnM4Jq!Dod;GUvC3m}MMCCw8|CICRKVR7F2Mh5^CorgI3oF=5q zFvI|h)u==Y=^7wu06q?Yl}1O^JL^+z6oz;cvTLJglwg>}0EQD2ZH_oaJ*X=P072X- znL@e-VAfs{9OL7)R+l7A0buRmH_p@PA&Ip8(_|UeWh3&p_n?^kW!J`xBWJ zkt?G?<&F)d;}a8cd!?Y2Fjhg-Bmg$fTCM~Ns%X=4MV4yK0su}My9Ne31YlOfhR|yE zw~c86(54AMABPc`hh&;is?=L_4CZTDq^DK{&kJinN7LL30Ei9O(jmzJ=+^E;% zS3nG4QbKG_`4xFe8wQZ)a4gWUg)2}5Kpn`+@mQzWR1IYJ06+?@RBQQscI3KUBX+&O zygWD8KHw{21CW`-4((bIoOg8{eq4)UXK~xdY`B*J5QPc=g0S}w2Y?*T0N^X)+#RR0RqrFDgkh@&H=C-rMZDnc9f-{F&6-h9rZZ(8Kr6f0CE=& zn+d55K+Nyc=X^z61R!_b`HEN%bAOHOiyOjNdwom*oMO4Y&oj|80PKw{YOhTuP{+(v zdYB8*@3VUw0Af?=<{rrfAOUOEPV561LP)BM;9Uhj1Th4%?85c zYEP9i*MrbGR@*7V*9S9)xr&~Ds9>#bQnU|9z%l@4e9i#8Z8VHbA;UZsbAPECu)B`D zMs`7nRSMdJscUH&T^U6@ujAJT$1n%;41i-W579|5y4 diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_10.png b/src/data/minecraft/1.7.10/images/monster_spawner_10.png deleted file mode 100644 index 91a33467408b67e1948cdac88393f0f1dca1c0fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1679 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 T5aEno00000NkvXXu0mjfSqD{0 diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_12.png b/src/data/minecraft/1.7.10/images/monster_spawner_12.png deleted file mode 100644 index 24ee09ab6622182b7683edf7c0ef2b66b3ab360c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1575 zcmV+?2H5$DP)rDyjVcOFn6$KFpbI9Yz9N_Sz4bsxILHhVFBh ze022o%Z)}Ohig$3;mWU%KH^&3eRBZFs{j_$>2v}<6!Dv;Z;~@#NiyvN-=; zt}mSX*U4h?Wcl~^!2I;e0Ze{=yYWDprnS(~#o_aA0%kW~9l#bJ&({J7z#fMS3!%_) z#pTa}A4Ytzym0{Ufq;h4$~Wnp}uZ9T=!0I9%AoDb3iSQzuV44F^F+#C7HxML^RgNj}>%gnSNwtn~=?bbm0J3)G?@4FO;7 ze-p69SgD7fKylh?dvS!Q$|gdLxKQbC+ae z5n#_f?j;WBdD85W&x3J`03SA6Ik37E0c!PV*i{%WF9K-@&>VmO-3Jkn2RKY5RE87T z1Ni}2ngz7yfVZYzSpcAf2jyD8Uc-Wb+3Iw2#>u@vEw0JwiAWCgjfEjVCfsB819TFRJ#`;+o(fuL3m8;L)?FD#W%BF8%wgL^ZJertx&x(5$0bF_^0HDt`3gF>v;44@xiEE=oHNfc* z*D9b>wezMpZxrD7g8<({Bx$QcpaL`pRDd+4tT;#jrc^Y!=4rIpBx-Ls7Q`A^lYp&e z=*4jT_D!f38nH9k;@W)y2x#>H1ZYQvfRL;Q2sqBl&<|LE%rVL6AOYgNVO~39uN;5? z?!xJ~5bPr$-+V88*CwM4mDriwc@IlsKg^9#3W?bC=jR_JtgR+(eSqsfd8AQ57@w20xs0Y+NMw*l zGVhfGw(9VB9TUM`N~SCJh_g9htvDmG8*f4n8W9I zKc$v?-Etv_4s*qf@r-oBgLopFU`()@w@l$Q*9p9|;y)7PnQ&hS-}fypv!mX}@I=A_@Qi002ovPDHLkV1g$o=@I|{ diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_13.png b/src/data/minecraft/1.7.10/images/monster_spawner_13.png deleted file mode 100644 index 9a560ea4a6513e940d1addf0484244c4ca9fbd29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1615 zcmV-V2C(^wP)*<3&8;OEMu10TL=ckN94k^xRuS^;?>^~|ECLNQ7R5bx;yW)M-XfM~Lys6V85a?J2O950_< z{l?fOgqHVT7~a2GoO{QP#rm3n$Z%_Q2l)a(o?|$MphU~jz|&6a=%S> zBS0HP-qntWOdh~~BkGqB057CyCr1fI4_M#o!a6ojM+ zxw(-yN{E<)wjmcK*4komwtBlm00gw-QOOWWa{y#rk6=&sgZ`MINkPEjuR(Npw1L-SsZiaqv4-cj*5aGK}Q2g=e~Kz^vuK+}VEsIY4y7{o_yrZpL!Jd@QTo2?40Nfal(-8A{ z5dsiG^;YmKo_(?I=7<~XAfNS&!ak6d#8!YIi4N`a2)_4K9k~vo*qfN{o-6J}1n5MC z06^bYYt%>tg!41w!NJyW7C03wO8^Eq8RBvU)J;3jit|hX>An?Udq{kkxOJO9 zlgstS6G32~>o&4zaL5y=Z)Pez%!QaZ&8I5>5RVKOYld`Nj~A)FSnh;r8^CV6tU#w<@_I_Nq(H%MJIGrGK7GXCaUm0naRMDoSB(f9(YUI&@G$KP zzRp`%62IjV5y|-ISq|u5(n|d_^1T-X=u!&-SxNh*my}<3viz}}^&js%4Zx!9nTh}a N002ovPDHLkV1nn~2EzaV diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_14.png b/src/data/minecraft/1.7.10/images/monster_spawner_14.png deleted file mode 100644 index cea2fbeff2a026c6fd0386680f6c40d0ccc9cffb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1585 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 diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_16.png b/src/data/minecraft/1.7.10/images/monster_spawner_16.png deleted file mode 100644 index 1dc5e3da1eda65562c58b35d30a590fb615e40d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1547 zcmV+m2K4!fP)0{dIxBk@rn*1hJ=c21zge04tWOqBWnmGdz zAfI#Jc3Q1(%fDuuj|v#Ce9)BlD zl4tM#u%Gv4Yr^v3Hx&!PS6|EZodSFp^;u9_90K;v(*k^?2a|;YUX6Hh@t^=nczyq* z+z@ifgP@;aM?OpDG|0Qacva6^hV60DDL7chg)&1?01Hm5(Y_%vJ>7 z;kfwX{#U{wA+-MZH^KXx^K0+eaen)tfLwFy4aRW+AWyGa073s9@<@NVA%wz^bA*dP z$o)3iwE$@pzE)CHL>|C?Cm%Hs052FMn;WrFg2fyqnp|F5YqQ14>PcS#5Rep;h9P8f0AyW{V2}6H(Uc%bLBQ$VFNDxA zx47C6@LP}vT#I+jE6B5;<^s%n5Uu80cs*u>%8rdyT|ZfiyPg8tS)r1ANCMn*Pr8W$ zx`wp$$Z}M{(o#S? z2aGlORSE!@a9S-1(rZ`{Fj<^!&oDPGb_zAgDM|Mn3qt@+yqdf#fPZ^X5`&P>BXkih z0DC=Mxk4Vn863ZEV$yeu(k8Clm*16D$#;e~2Rg;f3ZUvUnePd(7encto)KJ+umIQM zAPqo(_e?_?`N8jh?Bz{O*jIRF8&3unWU5c|!MCiwi^qQr&}gb;OVeZhD7 zeWu|{R^OSj^B$JOW|$l33lBuhk5|_ufJ1Dj?wgrNFV${s1whF2KQ97Cot8TC2yh!& zK0c)h)HgFV9_BJkoch%j0Is-x{fDWcd7thyW%C0iiOASnY-k-yhTtb6qq4AYt8V z66*s}AOxHm53qm}M}QrlwSZt5&2pQ_Adh5jlml+nk>j;bg!ED}Uf6r-bCJaIPD@&` zU(US49LTc(>Q955Vd|R zG$iS!!yE*lmmIab;)c9xG|b_9a^wK{Pku^G_qx@L;2q}5?bz(|2;L(}E#cwVdzO|P7cT? xX^kF@eCY)NveZIAC~3dy#pTzXEWa&h{RgZG_h+=kWugE8002ovPDHLkV1mc%*Qo#i diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_17.png b/src/data/minecraft/1.7.10/images/monster_spawner_17.png deleted file mode 100644 index bbdb0cd3f3f3486d46b26927a79a2c7f928de39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1841 zcmV-12hRA3P)()OVQ zK9FAVGH2(qL;C1w$JXt3-Ez5fU%q_tdiU;~ySln^gTX-5Zns^MBrb{~IhSkD!^4A| z%O2T#+~423(P-rQ{k~k^Xf#}_)$&Ty)SaE3xub90Fr?XRimU->I2;N9#`k(XZ#W9i zRT#jL1;F6>d@cr0CKK7CSFc|AJ^CgP073%+I6giW11x|&Hv|bi$F-aXz}vTP1rhvzpV!le=7{Jj;cIoL+s+>!Y93j z!e9+et^?vxhDWnYhwNB({)?NwxEC#ceh{NVAOLKL+21f4DS*zp0^lVJpq1(%!%tT) z9kOF;Gywel@#9B_K79BfB!cAW{!tpZT0?K-j3aApsc#XSIo3M%u6XgZZ-#pM`pf3sdW zq}*!k*Cwzy1;$HQ}%m)HLH>+5TGd3os;i-kbgvPmotS2rTPr(GyRn6h$P3lOJ6 z_gDb+4k1JiNFL+>JXphoPp@ksBl08iSRvw$M;b;7&?@#AuR!|)6vr4knypppu>#bt*leSV zU;T{ZDJqd&&>C^-I!RvuGzTc9T>G@uai~=oZ9Q@v^=kl%u-VFi`MCh-te1veuKw(~ zHyQv*%G_uGbR0u49&t<jL+PC?MWII&0Ar~{3V_iF0EOAOXJIt?p~pY9 z6A!c(0Mao4svvx5P1d0kr(Yis=U%c8^kI;!4JS-O0IH16H~@@cyaH&LmG}N8&cm{) z0O4;T6aY{2wE`)CFN?WRHiXn8Hf$8Yf-|P&v(^K304R*{vF9JXaHQLceJloGS z7A}nY5TNWHd#wXiN$de~BUz!#Ji_nxf#GqKq@{@&j)idF1;8dM0BCFdC;_m|S(KE2 zq}pmF@&-@06tj{0C<{=HX1@(QI0#kg8-!M=%yR@ z*eeGBu&Z#~&qVtGq{VgmTU8R*8Dm%8!;-jY=6d;qd&aQg;z9s4#5U@F(GxueAPQRJ zWOyPSXt)j>)Xc?nocTTkKx)+J>`GJyU;(3GC9VQc0|BTiqa^RnW{#?%0JfTxRUrVR zeK2osA&_*gL07pE>z&xQ)m2qUjaPu$5NZ|u4+$Gqle%@l0`3FgJJU{FT}I=?Co;y9 z%zNcPSaocBT?S#j)EUmV-lgpW!&&TR)2;hS+mIWt0J1*i#v@q>yS@7FqLnZ8)+05| z9Oq?uz90oqg^N&GqACCjo)61j>QL?M*M){Pdf#Ra0M?Qxjh1;KAC<;>*vxUBZ8$bVfBOH^Y-r)YQ^ffV@+2dy0p@U|8*9JgoS6TqX#Vh76fbjib zGyd1Jj`2r7YSXU|x>D;tHt)zb+`fJi%(iActV&^s{m@O{mz!aOWVp+hMRo4IDuHis+k&XV{~ZVHi2W*a$RzohN;Y2@GD0I;PNfU2bZPj6a& f!_M;mE!h4B?BknN_#5K400000NkvXXu0mjf%ie1r diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_18.png b/src/data/minecraft/1.7.10/images/monster_spawner_18.png deleted file mode 100644 index 39d5d07b88730363e96f857cd8a6188ea33658c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1479 zcmV;&1vvVNP);N@5S=fZ3yd)sV<13ILXt`{lR0XS+O7Tne@d&@s5MO^$tIP|WUEG1uOPCK-)r?H z=fj6zBRpnzUkxx`eIopCh_9c%7y#sXE<3$3)AJSK-CJD#T`#W)5Ww@r*}VbY4RN-t zBtN~~?0|+8_tSS|vi@uUNoqJ<5+ES7Lm{!%^+yBzFyg)W+5mD61lY=FPk$05$@7nY z`Rm=;im-hA!=zmB)yHymZ-CH4Ll%@4hk%{+tbh>d!DL~8S0i3tJ{mw0UOhY;?LwM7 z2uhMM>vEcf(97q)39qsvp&(<@5Wuby+L6$MW7kGkPX^%F(AW14cDV?Dk1ft~=j#X4 z)?(7)sWp)dLR^xI=jGVER6xq5wk&Eh6rqIx-W@sL=@lj^pqO2lVpN-Qc18#-j)yNE zekbhXLaVR;5`w?ExCyo$7q^cFC@i<`V4M~J^7Ls15bWQv9qBLc2r)P07~v!k+kPMH zR)91LKPxM1A`f8xq!_gjfL(CNs<|oaS+H_8S$w>>BwT&|r*%;0)yx2}G%OAQ_yigS zWJPHtd7nzH0ARFC`)#asfPmC>47NVIiF6efaL_H9U5H}<(DM**JeZjNRI0a5RjFVmM-LC0A%%!V2f`HTeZ-iJgx46C| z;I|+TXp48;C&;s)_5$2@5UuAM1b55{l@%MKzIpZ**EK@38n9ifL<0hsIB z%oW=atik@P1C#D8D<8OWUfwISQfQ4}44jlRFMzVoWWFQ7KMbjNdQQ+g!UD9#K^lO7 z;F^v!;)B2c)-8-&qfr3Ba}W>{;azLGah<&U{(#)>l6;_dgQD`TvQvxf99x_N9OPL5 zyIHvR7k;kOCJWHlv?vHTvb6$W0X{7%|JCuZsl1b&Siu~p&*ToI1OVE{OXp&tU4#I* z&~dl7<C#00eMFg#aI{dk8ox z>aB)QW|YHhu$KU8JNo6;8m(dg0%R4=hZUiXfYSYruf>8mMMhTM{esvva|8R}fgmVYnS2kL1Q!5as3YhR%eq`9gqUs z2=MK*6%b9MdEo;Y3+UC%X;5&lU6CRF($3$(}!;`K7_Of`>fPi3E>ICHO zh}k3{bv|ILgZ!KQr-t7?aHZzYT%3`myM2EpSnXI`XC>`oZ#wwAe4-mP`FhgzLLkoq zwk&QlN@H$+>j44Mb&yJRGk2oSz~16bDe*@R7Ew*-TQMNtq_uiA^0Nm7$W#jfv7mj| hgVV3>EPo9({sUOw(k_?NtjPcX002ovPDHLkV1l4(uB!k5 diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_19.png b/src/data/minecraft/1.7.10/images/monster_spawner_19.png deleted file mode 100644 index 5288f57d5a478a8d91bbf51fad8bf788c08d344b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1688 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 R(%b+5002ovPDHLkV1kfm`n&)D diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_20.png b/src/data/minecraft/1.7.10/images/monster_spawner_20.png deleted file mode 100644 index 0abce452cd7b67076c56a08ff32b85b4548d5cd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1844 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 diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_23.png b/src/data/minecraft/1.7.10/images/monster_spawner_23.png deleted file mode 100644 index 4015cd8d2d955be716acb25606f47aad34124a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1565 zcmV+&2IBdNP)seI{!uiAkTBr z&Y|j0XM`7Tart*P-X}l+&&QJ!1-uyIY*|UZf4tZM8&ce7-;v(Y8wE&G?f#em0j?c# ziA@h)E8vq6uMdwDAm>1UtvosZfgnjvU%xZgYl9hKeD=Kxx!{wJ@$5tau7|oTC@l^F zE9+?iF4C>uNC8hqJlQ)_fFwLSy->Cb+2lb`lJr@Z(=3GUUHn9Nk{xjc8Iy(pb`{r- zxE}1g*4aN-0LO-XeeGbEi|}{f;ygD!I#p#YCM_OX6Uo5ECAfGa>8g(v5OS#{i|PzT zC?SA%N6uI4u?h-^2fHfnWGWd<2(HEP@X_gagmqkK_VyQo^EbPP&bDLs_)Gz@=2mNU z!va8_KD7XX{@b@B&GDSzb3=|1P6EE|H^Ht2NTcwxq9h~o0Oq&jP6+|ng&a{jR7o~) zR?Z@ecSn1K{Wm|C4(diaPyj3qi$efDfkFXMoG3}&q*5&a=#0aD>uVh#Aaosrt

E zU4;c~)Z$_n;urwzc?hVqdaBu*tfWy8;v!_nMyQowF&mL47pKPBY;m%B)KmZjL`kot z3*|8Yvi6Q(j_2#0K0%U#fSr?X3BG1-bTB92w;&JL7O&=?AkTuz3&_8NXf|BHxnsFd zS+Oy)!wX|^d#8X(BT-S@CIR-kTh&Mb)tt24k}l^7TukN~#2)9p0c!+k>< z0{9*X;CT=Mc|f`exk|G`b0A+AmX-p-F_2r6KcxVG3D>hRLGBs`1oTGJ#Txm+#dM*0 za7xlO%fb*q9j_*D3*g_b6~rLq+7Wt)7J#{$&Ro77!5Zwpc3{%INooRD&dYmcR&uT3 zjDhWBU<6S1=?zx|n1>9! zU$_q1k%xx|nrrA?k`FX)5U0jfR%(%+V~cZugFFjhH*@#?!q4rr$pY+awkQbL(zOC$ z0VXY4{%gm>qVo1uVg+-YK7%_D5&+mfp5!jZ_kDQ(EB$?ce@_D7LX}#5$)8=mZpVo2 z>mcu2qp%M6g4hVqBvGL;_t&3uy6^XQ19f?MN!MLjhrie3#2J|OoGtE21js;z0D$lN z@vNh+udj`O$HzyC3%fb1TN%tJ01X^BaX|qUUCw=e?iG;F8v%I@fq<$`1b85JgJXaN za5h>;0J>BZIe#~rE&{dMY!h6C%qIZj_V(5YU@1Oe1Oh?5%&k~?5` zl}o-JHJoj=?J|5mC~W4cdH;iewX;d64oHCzaQ(+TD8RJOT7Wl=HewUVAdg@!6$5tG zk?plhgxsa5J6btQ%Lm$4Y^DQeGY9f4fa;Sb4^Sa&w!$yZyoY+ZBY|cP_oX^s02aWo zi;%CG19=oYnlOQqx&C8xWk$ zT)JqRT|0vB2vS41-E|%lZOd+M*A%dp#ft_6IJ?qZKqEh576}NQ57_D;|7`!M;kOT5 zsrj=Z&dAc;{(B{uu2|g8O16tV>)`Y9w%wq~*OPfK1oA9k$>KVr6z2Bl9uOd12dPwM zE*9XbyoD+8Qw|o9_J>O`Am5~wdNuO72L#Ae3jw~MebIx{uiaUG8P@n0zdi)==}OJY P00000NkvXXu0mjf(udJ| diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_24.png b/src/data/minecraft/1.7.10/images/monster_spawner_24.png deleted file mode 100644 index 31c9caa1f4d46d8445832df94cadb6342966de64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1631 zcmV-l2B7(gP)Nc^f{&S#(D>tx1B zR&6N~mX4f^9s8W`Zs*mj|F`fqx_E7X-tr5zG08OehoC+WyG3HwIvC_{XY-40aDAY-tJWk0D0M40RsCy=8@L) zLJ$i><_L>G%>6FetpIHl-Yd!aLLR{SLE7Cw0K8Bl$;T$^kAj_ZoyB{TBf;_gw;LyQ zGanfMmWIV40DEAqfF#X~ChtnA6##Un)o~je9U!3UI5t|JVWLBY0(R=@`Ve9c0RB1z z?6(J|HJGiGQ4nGi@^hnVl%SZM#F9&MXKh+ste&(C00Buh*f5038~|D0BUs~lqdOF6 zQV?)>`9=^M<|Zc>0{j-_0pH@aau4zpw7G!tGl=%b1%e(ch3bxtt$%vwEbe;>*l%Vg zNjoCIzwTZwF+i;(tv#~a=u`+O!)7H1CMP0*Ru6`qMQ42MNJ9Y6fdH<92*?9EOe9oV zU0DP9hO)F4P@My%HM!RU01|HWrvmLYY!EP*%!_N34=!#BEt6A|u6q`S0GW6#d0zm3 zyHyf{P{<>46Dt5~bz8Y&9>FyjzkXuMxmoTKSFh`HbyW&oBbWmR*~kfy>N6Ox2yiz; z=^f4mzDFp)w>U@x5D>g(NgDaV&!5#(qpz`60Khc}h>38aH7r7>nf-HvruCA(p$mgF zccHSy8&q@ze2>|>U&&m)xy!}o@0Qe3e5P%TcuQ!Cu+Yi4)W8KdYKh{BBAKR)A#FE$v zuq4r;uYdR;pho~4#|Z5}M}+{FtZM}P@#kLx z2-!>fviAjCy?JkTllE2uWb9~V5315eIRF8=3pYEtV4VlBN8Ce9v)L*-bxD5l`MnFL zP#M*m?!4P2aXHMj?TyfLIwt@~$1`P&Ft(Po$wL1OYNWbo&nk zP!K%;k}&}XNi#TB`ys>UgSEq4t(PLi;3w?7gDhq=5Mn;`)4O+oxDNjfTCh}Ap2;A5h1+1-P> z0k*REx(x#S@WG#VPC)sHNdZ7eK-KdBtq$@}_D>DpJ^&DaJ^KNlkvUQ`2a53^U$MB~ zY5fp;(v8o{2N<%-@Da=F*OTQe1o9N{z~Z)|tgY=&xq&bQ=+HqaW%y_Tq0YOuBtC}# z{U{0K!?CMM_^#iiZS-p7xi-YV79iHQYY?DIEd<1p_QeQb{OdKAUw^WEF&j(eg9KJ< dTz_gFe*^x4qHQuP)x*A)Qr+~feIUSAo>;v}kR&Isz862wHadj%%DXDf1<$>; zJ4*_%O=`2Cv^WGL#?u09q>Htd0?v(iFukGxNw~ATrc4(y$%CLI>9Q`TSqPn8+a#RJ zir9jTNkag;ifu(~6T6<3XI2%!v0*+RIN0SNeD4~Z`zGg?RlgRK7Ec=!$-u@Xb?|&p zQ7m30lYnda<6zeUq)~V-FQ^iE0R3Zr zxeozYg$Q2QR6(_2-8p+%ywaK`%v`(GcTnfUh5}$|SR4Xy1$qkb{6IQ4`SFRHzDF_%}dWYaD=329h1pF4{0n_4{=nC>I zsDA;`J&0DDU07Ev5-N9WwCdbiY;kj?fYE%QJikN&%yCCDo&quvX}Kc9xl)RN$ZZla z(3&LyY;~*KX_T5XF=+_kcOZcKK?LLh=_ceVg);Sld`?(e3P_KE$eMhW0stnQtF{Sp z)zBcI)|%{&5glCODl`gCNjhs-7y_u`)#Ob9{M&(o7=&yqLX&6#=*#NNGNj)6B*9z}7GPQ&qyY%9jv0|geDM8S zSzpO9dI|uz4+2~wV%Ms7T_+!$PLS8DBqxmBzz<_rN$f?sk1fst4)QF3-OOJ53qLp0 zCJQj1;r`zjFVsKJpQ}n(CIKUQuK-v;oE8oLHRGYX^VSlvf<8{4sVk5s05E+#h+ORF zM~~ER$H(f)@vrpvlV6TW09 zDI}!*=H%&9wXHJ@{2u)TD;B`d%*oA-%&&}71!}9A`Yz`3s5tf26acVQt5XXE7Vy)LKdA2? z9>t_V_Sx@$P{D_Z@$7@!n@#~t5CU9j6v5lGm_ycJ0kR^sWg!Tl@vZ#at$;e-N-{Hc8tD_&o?=my!aU<+B#xOrv=} z4rGu=F!vP$X4aAAwM~RvC9l#-oTcT2rWFfe!&=ONJPV-xNs|X?BPRgw zP0lnzsN)4-0St2!austRj}0$Q6vaRRsn$<(4N2No%-L210k1X!!mNI*V1V)hb{ zc0ORMgZzd4r-r{i@J`Lwyf`CEcRT$g7$z)kW+l_bF0}D^dCWXz$W diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_26.png b/src/data/minecraft/1.7.10/images/monster_spawner_26.png deleted file mode 100644 index d967d7d5ab34ab5ccacea434c5625230b141e48d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1698 zcmV;T23`4yP)A>A93Ao z$@Ub?kg8GDDakD%opaw3@7{gi!rS2FqX9aT9|iv#;zt)(1^{`kMO%lazcUfMd5i1c z-SNHv0=OP;pBmuJ5T|7|`Tp_D13t94Z|;%a(FX%)QqBHY00AKng~YZG-W%Yn5w8x9 z44~IQfL7kV_*I}u?!2F-=PQGWV0`|I$qT_3-^P3g0SuLpM?w$II@j92FaUGI zKfiXe>znX6>*ieBIXW||T1;C!@17_IAuhQ$uO%Jxr2_IoYR;mzLJ3w7K=0`Fay2%& z0^-50iCbNh47LTKo8#f5v!4a}{O33}fF_0C{M*UL8$mF%b`OJN$L{gD0b97jZml2yUT}!o zLz8p|!Op1@6T~%SkQ?m@_CI_wpNeHe@;tBqHjRSzzyPo`EDizK14{)&abh(2w3J!_ zKx>>Iw?04`fPm0>5Wl^>m1}5yhKUXp3fQQ`%R`7c0Ql<=P;B%}y|+DAM*pqVg%Fz% zh>-mC^|kE%QR0tEO+YalktG+mQ)|=WV)dwQ00@YZ-ijgQasXs~k6?}K)mC2s5)Tg# z=IQB41ZLNLoCxr@AP@K!FS|X+Q_$)H+%brDhcg5{=7cg?@9yr*U*(GF z9$uyvho>}opjb;x6gNeHf8Wh=WPq|GtvynxHgg2Huvy4~(SZn{)q`PY(H!olq#+O`vUm4Yb7xVg*+k;u>!DGv6bub@lgOF+9S9J z-@0K&)*9{*5@Q$Z^U0JsJLSt1Zx)9G|3!k))CLIE}FB^~E!7{oK; z2oqlbsthg81P6HvV3>txe--C`*`xsf9F9?S;0*u*Hf^r}C?GA1mK4GVfLAC^hYba2 zOJj}YGuH!o0sz12Bre2A9zyUNr4#}XLd8l|$mkGa4rp$wqgMbi^g;Bx|a2(=t z1r%*N&x-R*0nXy70M|osu51f|uJwp*3V;`o%OTae$+|=U;+@rGGwwb&G$jDn7NUlT zg#cEeJOMIx)RVcYv{DX0fbPPzW?PUILfB880K`4Zs&s1iK&;`IV)HzpJMVf)?1s69 zeQ-m?d}sSm1Te%%2tci$Izkk{Bn}DqC#t31s(Pbw+}V-|)b9gp4RbY2oObUE0O*nK z?y*1%ASrqTM60fmX#rYnRW&C70xbB@ZhT)Z zc~-3G&y#Kz0(lCUv$(A&OKbaUZxEnE2c=Y3E(!>B-lZk+Yi<C?!! s-XK7iS_sHW+Bdzi{Q8sS_s!e>0|B1CRB5{PVE_OC07*qoM6N<$f(@t*YXATM diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_27.png b/src/data/minecraft/1.7.10/images/monster_spawner_27.png deleted file mode 100644 index 2be2890d7b4ef2620daa15f05cbd73ae5b2dd0e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1716 zcmV;l221&gP)rwk*qbe98Srl9ILr$^^QB8P>ptGQ)I1wyemC6&toZ0$X^4EW7E7 zneYyMgg(IGe810s`upfevO7r|W_o76k#gip-}m38Rx0n7e+>>EDxkab5#fJBeDCCe z0zjVkg0)@MU*93zd5g=x)A1Go0(d`~94g?>5NFFu^8Nj(2V6*TZ`~ukz55D~q}u&4 z0Rns;@`+8h?Wvg|W5nalV+BaUJ4dI=4I!622uhN9*5xt_p_`}Ygd6dQFUgoR z1aPSMJmPzB-nGuwi2^t`-0KS`ySxdX=iQw5*7uGw*Z=&!rhtEcjR`OQ7%JD|MfXH8 z@Np?5AI4qvx&mZKUHy`(zkX_x01zkqT~X&BR;WS|<`BT%k^8kqqzVN@gAEmRQWXy- z1mDf^@X^sHguF2M?dz&yApqsh!^Z@81meCqU3rxw8@t}IV`KkV0g>ibZ*_|WfIJS5NQNp- z2j0%ZnR0*y8k(OCIbb)(y%xL;0Tlo2%=a?^0t&}0YGP5 z9Jel53Atm_f%@qVMzC$Lwpem^GxYlj~bq{TV* zaX#8UAmHDEJm6ZqW{x1wg60=s&OtOCPT}>K5z5JmiUX^syQkLT@D%oB>{r8B1yP#> zxc6PD1q!Gc($XW#jdpL~7;TdPwz@a$G}^;0OBw=L3cl3*5c^o10|*}oKnPXq z4IBG7e)S;EkanAw8|xr1uPxLE@{-sJ&?M2JL0;y-)$`|cT_!HhfB3R*i8P|vo0#sN zEAB=F$kGb|0RIjGAczGZ2VT5Z2 zU}l~Y%?W^jyfTX9Egj}iHCTY0NPSfZ0%&~DzmrKUJwlVKCds2jW_%7p?^x}I48I?g z4s$g#{~%%AYEsk(q(BJZgk}M27Bk3ax=$x^i@UdU5#th>V;ekVr`kbmv3)by^K4hY_1E}4$aK9ArW zNoonVyWZDC*Rsp2bpInE?0wU^f1zRtNc8`=1*A`oNu73=czq?v_4o(0TUTvwFR+J4&$0%Yi*l*-D*0(_mf zv?RXC#Uhgaa3%-jm$bP)jlAsz0kYIWKwi?`>BZ&Ooh;uiXZ;6Hh6?D_{rX1$0000< KMNUMnLSTX+fhCpz diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_28.png b/src/data/minecraft/1.7.10/images/monster_spawner_28.png deleted file mode 100644 index 890e35a8df4bfcb5a2a84155b379d4605f7e1339..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1681 zcmV;C25$L@P)2Gd(js)6=urGhW9VUa&E8Kx|SFk(`i3S%eqa5H3haocIgeIB?>C1d0@K z3=$}cgt!2~`4b@VANT{0`fB>M-&9vG6WNK8Qqrd$SI<;`->bJ(`@)46!#-L|TLjd) zuW0;lh%cF%CzlC0H^kYpl6-Tqw*w}mxaYnj zjfG7DB&kZXqX7Z79kPk_=hg{$X2c5<3k1kH5MV1$uDz}yNlvZ55#GF!@NImu**gGbKK%QH?^=rSuG|lp0p;CfsISz z;zh4UPb(nFrTQ$YGL%LJ0lYhMK38xlQGnZ;CbwEAuQjP*TO1E>uWV}!;zHf6cQmZO znVz?{9n*`e1h|S@zFbQd0P^~(1Zb$g<94LfS<;AeLyi$n0&&|P2D=gIT6;!gcJr;wL0$A)1i;d;I0WDdqzZ6ck0kjpl_~*1 zwUg|(ajgRcB;Chg>$96kS78A|c{kmKI0gW79s)+o4JtJzBWVi?YSil{1)T^)8e_{ z3i2!{yMW*`h}I{1uzlzB|$*o zHjx-;&uIZ{b*tMcR3>Ia(h$JkfdHNd5s(L@n`l=lRrMUm7lfsyfaDkmtjSj?0ARv} zdPhU<8U_S3+EcwXf`d!gg$BVXN#_jB%1b4tV95f)%t9HapVu&x=9 zMttz+m+~&jHBtotJO=@BB0|?{_FSjvojjnZc1b=kbOYB9T_sYB)Erx!103X80K1vJ z_ZNO{rcD-L-ZMo(z=*0901F7yqT#=0JoGAWBN8i^0dS$w ze4)>uZN6^Ci0SJfAGbzo9f%9!P=F$d3jO5k>-6Eu2=v!96YDj|X>Y@7i`K;Q0P7eRN|rBET$UZf#t5pthbVb2C>&$EmKS0DvuC zpI+231^oW#(_R+3(>p>If_}}{2m*Bb5bPT2 z07ya*u3_h@NaCJt2gaPDwXHT?hR+A7&0H?%e-N-{Hc6@jQXmA}eSf}BKy3T01jMG% zq8kP>$Rn6D#ekW0WP5EBA$Q5CwIgR~`9RZ(CBJ2D=0KhW==!9{1G*5F%E>R!Vh{Cl zM-rMje9u?$05u_pEO3ivqG%Y(kmM35!i>D0;uy&<^fMRgOOcRiF zK47bZ{F(iyhTlGLrRHl&c)O0(lnDXK|HL zQgi!R4+xO1gH$Rr7Ynde-qe)%EC-A5n-hI8Am5~AdNuOA2L#Ae3juLKd#(qkU$e7( bF^usa;jcF~Yd;aM00000NkvXXu0mjf&c_CO diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_29.png b/src/data/minecraft/1.7.10/images/monster_spawner_29.png deleted file mode 100644 index 7799298fe286c093ba7b56df204fb9207231a366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV*j%Hb93gL+bfu@8_1qg?xnMCtV`F2ip}rov+Ixxq{P`#9?d_%eKmW);zyJCR zJ$D|5$7=#|mPU#zseJ@N%36d*amI+Dz>&n^@0<;RU4?1ewMc%w0@3`?_eP z>lkbB^Z~kZvXe%KhbY$8O06x;w7Io~fA`D`&#zoWkQss8f?^f`)Dkt;&0`5j%bI#> zRcdc(qL_*Veixd(kf5h#xVNy9Aam`F4X@C$@*qc{WI;Wv!^hsGONTl%$h`7GYTdA! zy$`vi;A20EE2;@{x+pxjXL~CF^@1`+L~yyiU7Rdrc%kt z=$!l_f*zaU!SWh{OoJ=t*OHk+L!&q7jmDJ}KYoC2d^f_z9{9LJX&04+{S1S(Hf1;< zkVbO;aK%dmp&rU>m$M#AM5H*K@*V(^D*gSvbZ`7R8;=Wqe&Su)*V#s2?(3kv?{DV_ zKoSAywZ;a0-n>~02$Du%H`>XLNw-6JpYG(cR$4h74Uj89AX-L&ya)xOB`ha{0aP@9DGT`@Kh{a( z!#(=q5R8WLfEXRWo2Z>74J<&QBWj#Udt1V zu<;PqGXr^(06-Khc|wI0j6}()m`sm& z`P&EAbE$T11--d#EBQiE7Ca4)0|2kkgaDpEkWAxsD^&ncUU70QAm0%I(->11 z&z+=GUv)Bo)As-Y6eQl4G%-^}0H$RJCQc!#0m!}%fQ+1c^5>W66ghR`2p!z@78@j+ z5De+Q@C{1}S5i+JLab>mr&wWwaTQ>E2uy04r@$ zYM^K~1Bll-|Hp4~M=@(Aw{Vs=8UWquo&YcakaZXW;~~7qIRH>uAEiux9 zmF&fxwgxhTQ4PS|C%-TSK>9fV0tKZkK;Z9gUyakALv0#h@KP7GH#hOcF$=+H2mtsz zXITNYG}NVd9Q7gZU(60@ph*EhvIYPX0>ud9htD43)Ec?mm4Hy+V;t#MH}OalpNbML z*mre^UfAgVXBLmddQN;i=)LsDzfNqP*C=7Cl9ssab{&I*rko=7Rn4ZR(v`^OvxB)=+F(YWD z7z3zTX!n6;{tT}I04bD_?PX))mwK!M-k^716V9IZb^!CcDeVJJpT+YGpp3*0JwDva z5#X+*(g(u#xFBwNZjD^!_pzq+y7PDgLC37_)!lJ${Go zg?#{PbC(vR7-V`}c3%hpt`PtLUeW&npo`T2kOL5Pix%?tJHKe6ot;e#Fe4D5y5+M{ z0OH+on(oQb1uR9pe%+F^06cd1gGpU!QZ)boa~JmIhFIx-v$Jy}t=JJ%o;}QY4}c-{ zo_A_>K}6`{`NZfTH#K-V!Ck3&dCGasop)+QYz=cc>cTlj4TMYPFo2|3(tWh*^+*Y5 zw*mnGQVTaT0)WWG8dvGu2LuWi8yP_K^}{oH0=4f0QyS)cm^js|9RL!KN6O~1YG(R* zv%-Tb2oU%lH|WD>4)ehG5THRv0D|EFKm^1<0HkZ9DBcN&IdlyHFeg%{VGaO1KB&I~ z2o(0tU?9ArMtE{nMh>6*N&`q213;$7r^o7aT}X@<0M``CvgRKYti7Aq0a8YA>w5qQ zkN^M%Ef*I@l=S$l0G!Ur-}?f(kYPNEc~UiC?>gpq?F3;)$rCP0xtGQT`I(Q3irtI; zP&DOyJT@rf1%US_Wjw?ip+Cp{>0H{IdNU%nP0sFwkg69*07Ujp$f-~T02`ie6gfeH zT)pp>8m7@s!<6zICP08aE9RP6ZMgrioZZRhUu-_jf=YPWMF#d`Cr$(MW$WAS< zKI0zQOt*)R1Vbqvx9_y}6nmnF+%IR^yqIl1p0s8m7%u=x9#7Nq&j0`b diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_3.png b/src/data/minecraft/1.7.10/images/monster_spawner_3.png deleted file mode 100644 index 756b437eca3f6c6c27c6ea1bd508b57cafb3a5cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1703 zcmV;Y23YxtP)?Cfz0)T^fXhQJvC-Or0-hLge_>Mrat#F7%8UD#36kW}!4-48++8R1_b#ct5Ipgt zzrLdY*G*j(lop48k^Qs)7wKBNr+^b99z$F0Oy8%ed1)7oA7zo=DfDFxvPp=OjfV_}OSyWdjLIDBn9l2ie1C=Wv=q{_E(NbY|k>J`KH}CDfL>Lz)f2n`fKkDHy zcP_q4aQ=Z|x}{(A>(kX1)NBr%x?_p#Puck!pXNVDIr;{2*0Mxd>qGq5k)` zhFy&)*|h*^6uy@iwun4{^|_!?Kmfduz>5}C*y=hvr_18^vNdMP+-(|F8YNiF zw5Q1hk+C*goUHCu6#xNV*e)1CNe+Ol?Gdc;y5Hy!nADfw#3W#T=S70F_|bc})xo<1 zI`6G*6YyJ*2W*R%l24FlLB$0m=OEfz7{ckXL?|cg$9H2j^~UF_wQ*=H4o_`g9jJ4M zw~UzCN~pY`P6CbxcT#(wFL??mC8VWCX8d}NfFx{2a-g?H0@&)#u+yk7tQyh~@Z8O> z)ZT}8NdT{d2*?9ChsUnp91Ih*+MqR%_l2dUfczXttjV8J0KkO(R-Yifh64iHy`|wE z$%BiTLX+fVBHzcq&^bKD1R;PXUQON>z`va+i9yKa5xR*MfVHx&T)g&C{6ngWVGoX9 z#-+E0*8cWhtZRE@5?AgmEiS8)o!pr@Fc)@>0IELig%JVfW+=U#CBpSjnWwFUcF4Fwo@h zd=XQa?7o&3fGWclhXAaBJPY73bI<-F&h4_v0_gCjhXkPMCz4?L|}-2tWwUmi<&byJFpLUUsa5eAXUg`#@F_8v&XmI&~WW3EzZ>ofPh>NKmd1C2r$W7Pyo#_K}(_L+XCQ`8Ly_Uy6L35raP`eLIG|W{naq3T70KlYL%UcAO04dP7I#MK(6)kLPL@+GR)E6 z4733BlIhu!cpz^T8s_jlIdXvfW51=QXWdqp;2h?n;n?i*2+onDhH$;}nGS-Dt%tMiU6iBIxi5m9F$l>_ok xTA^1XPy2uXS!y95D{0U4!R6PUET0|L@gINTZ$P3%iNOE>002ovPDHLkV1f@)CguPD diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_4.png b/src/data/minecraft/1.7.10/images/monster_spawner_4.png deleted file mode 100644 index d8fb6a7cf939852fa80a486828d68e4d2a9f7fa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcmV<31|s>1P)UtQ_#fDJ9~x$j72 z`4j<~RI%D*K!9t9Tw;Tz;{-f2;@SE#0eTDs#LDxVTMSLIb^P_{e!A9SG&jysk_#UB z)$FVh;9AsWL2Ype7?{rpaFH%l8U!2}aerZh08O~Fev)h#vdM#>CK+d4NwW~TaPk7< zNOr^(WI`GO#8q57;#xTF-t6Kg0TLVb{jq~xPa@yrCYQ0+@;Z%bF>UdrIgt!pToNbG z`6YT%0ZA^^XHk=(7$XRf-O=NztVf9gyjq*Q*)sXHd4_9pEZ$f@%NXV++y9=Xi;qwA zV(0Xm4Cim!U1!_TUfCePGu+aJQnCP$=T9SmVg8QWk$iKN5$A>yBa#F#cKx3(Xy@+R zWM?A|b|XL=Mb^srWhM_`e8!s{K>&6kL?)<{U#>YTXIx-z-G8;$$Tb!ii>EHq8#m9> z)q7WI;;jjqJ6ny-PPw2)04xoQLjXR3p#n0VPnvv`N{s+uwwdg=HoiOfmbP!b%L0;G z3tVD-aTDz-BH&os8}3391Asja0n>#F}-{xNkPEe+8Ktncz3Tw`}_O+ zy|J{)z;8hwuq~bnKS5pujV>Vk4x;6H56&G6h3bmEcYBx0-II~Uu~Y4x8qHs5L}I3M zK4rWj3$W*%N@WO0g{1Y4OlFG-0z$VLh=Ilu3lOV2-Oiv`UyMjYz^@PQ;8_+R;~)a^ zfOZphmHaG^fqYh3S_?>yfzX=rsRaN+I9qNq^seE8fJ&p)na2 z$7{&j0_3-21u+P@c7zu(0x*^~nJaEbFo*cB9hm&AA4Gwx$Mv&1E4k)y#=wkUiv)1? zsniDqM2jKyR$C02=G92e6U34_s$%;ffq!sGEj@mm{?o_9OOlSxS6~6 zSAK4%O%Y()Q;vQEnkS(41wh3>GH<4V*M_i2|lgIgj)6 zSOMX9Bp|FIzyEoUQYH~#!S%gP6aykave7sK(50ft#do7YFHlqYBEwb4oC1EHpz7U# zcD~t;1c(@&zmtNvuOcgpOZ5dHAaMsEKq@K(M8P^lK2OdK*6gaT`Gnt&Tt+ri8&Id!Axm4KyAYkom zl2iw@z|f_l_^{jJzV_J&h)tt8FA8LkM=*~R19sNY?X^pU-la^bF>sdF3))u92Q_Ci z2l66->ysf5a3RbWl3$+19_sauBs6n)E->)|hya0IgyNbxkVnCb+_K;kkZAoR*U+R# zY3BHU21WpC$+78_I*^w~YUc2qZaF~yiQiK5S+`tcIGeek*EYL$1m6*)5#eIVc}%n| zJ2{gkU@VIdyCA^Xm4*Ux;SqC~fTZ(*SRLe_+J9=~?SoWm`OK*^vUaz_SAxNS#qF$Q zyVz5`K;k4$9LGsW!uu&6Lr;%*2m})18(6bqfy4$_A%p}g)=0321xx<0y3UQS z=cZhCoECI5QkQfTQ%=g~+`6waU%vbq_R(DYu7KL?--Q1S@%hz%6aex(=Zwv%#>6b) z(_38r9dxD%5Ww^9_>uxX4RN-tB;Q!*?tlp??zitqeg2yQB&kZHLx2F=4%x)|GiwU? zWyA}uc?HNh5MV2huWk_}$%(b?=zhLAOX#d@sx%jT_tBYMQh@EDHVaCNLqKdjEx<;) zTyHDj-H3ZrD+-W=XP4KN=|U!X5R@d7tjlQ@LZ{Yu2=B5Zwjg8D5Wuct+Yx^7)6hkhZJv=<9=jUeYQHCO95Wu@5=W_*Dr3!GHlgh0I%4?1jY>VUJ z?d1(Zk_$aPKB||O7xnh`re0rPyRq|qkFdG9skXMZdWbbA=d5kV2>S1&9VvAd2}y3qF~UgzbKBe7L|h7pf?W%cM&V~UUO?ml%#XU&3<9tVAsoM@ zyr5~VoJoOsb92*e2JHVBm4XNYGY%A$S3`_=rtBB_;NF++|f=lYSg+2Uk%r=$P~aJ+g(7YbtlWX&DH9M2c34FX8OHFkD(NWj?A zzXWOVgM$OLw$^Ps+B1s;{1)T^)8e`C6XaP?b^+lvhz6}LtUDG8l@ygE= zQ_PdRRd1eog%=Ntv(Leg?az7{Ge0z$Wm#Xx(81hCbuZl_UcO-H05;Ns#! z9UdN%0G$vj+?kt0VBGcC;54zfN(w%5Y`ZMo;jTeSOCWW3*c-t zhyZk{D00c&sNW6LT&Y5^6|y7&v0@mCk@-6L(0|*#) z19g6W9uq))j8h&+0JR+@uV;-+F#rLw3KuIrA&UU`J^MUWYD??TPk^kvg9UNe%$40@?)-z>p=8EVz^`|KSU{b;40>Ko3!wc>s zZK4(w!a~+h0273Oq%?})?c2;DYp?*>k=n8l1W@}RPHqqYK@h-V%&xM>*PWuZtu|eT z&j)>*xm?))AYjdGl2!+#K;Drw0a5#`1tg}?q8kM=$Rn6D#ekW0WP5EBA$Q5CwPR;# z`9RZ(CBJEH=0KhWP<_(m0V;&0a{Al3#6!K@k(6c*-}80604#uE7NMkO4&+hrqC`>l z6p(8DG}n-%vov$`KLafQwPa`{Cl2I6re+S`lPw3x|MXjGI_m~ag0-3RyKS>=M{tcG zjR;q2)?=b+*{`E{1q@{IeggumU1=zw7#=bE2}nC1u+>5S!~RplZy&f)^Jh_(;PdjR*`UeSlVL9e@+_do;yR=B&FvpOAV9hfQmM>bEWlQI`=-QS zIaq|>X!XQ^e3O>x)yVH25Fk@61SAFRryiVs&Cc@AFvbtvK4WgX99wz-00002-T5Hzq}Ten1sqNrQGWLsX}N4%G_S2jQ%0^}_pkq^w@b*7r^QEN1$?npCSdW0ltU&ET}CG0ZaEY0(_*K-4Ov#Mm*d*BR~_Lo?ej~ zLN0j_)FiX4D`gf!_paVDp2Q=*BoopQAfe*(i0{E!*V_B%1W0bU*B_ni`X+Lob#qzU zIXb0vEv7A=cTW@pAD7&l*TW8dsertYTCk|8P>eMMh#b%cp-N{lJ z1tDodZf@j_5+Y`+YRCnVwYFHCtzK;q00GsoyJiTbIRLV*N3bUAwRVr8NkPEiwA3e_DOM|^l?E$(^>DAq%&1}zrg-nUS$ z5>QS_YmaQ#S~&vJuvyB1(E$q(t9!%Fpf%jLq#;0l0|BxQA|MawFyT;Xw0RBWYs%7E zKz55}v2;hm=kaq>h-##jdLCEJ3 zeuxo(wTh`+SsuYXB!1n*gCjf9`JWNCEv-U(7g4{Hl+C!^q^Ol7 zb}b0KiRrGn;+{l+PE-g043DfU08=WOT=p~?C5c*Yv>0w9 zLs)?L%c~Q5b9+j6=ZS!SHa6(r%}s`FhN&1`zi~bubSMn!HjLWM#u6cIap}GQ1mt=E z0;HotfKAp^z~_fMdV6~VKzz_`FC{ZPQrh04-#&iexPQL+jQVjq>C_kz ziq9x&m-zhbc+cd6F~G2!=>gq&AD6`GFxNB>ZmO8?Ob%IqgxJCkDxHZS;KTc0t$@Sb zkrgm7VkW~R_6yt3=wv$KM9PY4yxKpt?0s&cN6v?}Cm_yYN0eT|!RUruA@j>m}TtPg!Dl4;q zpup#yc3|eDx*e+VZvUkVi7Fl>@r!EbO{6L})KnJENt&w6?Bm#YU7E40$o^Mm%2d*kH(u z0PatQJiv{x(ae8&mbt0d9?2Ny#0Zhe7eE9EAYk7#wLMdUWft-cb0Cj~XT!1?5|C^C zywK33eZ!p3BM^XIvQ;dr4S7rl<35iSnzTF2;dgrE0QoO|OU--TxXtK;1!x|ZE8RS0;L#aA5=;GIfS0rhl?xk`Y$KUmz%BvuFculAoBdHW!pT0ZM) zkF3LO{z@=fvbfu6b=-gTL-xxh$BGsGdNQ4bKwbnaSlm>Um9_nA9}u8J2c=Y3E)k&j zz}DicO5(RXL`2jZF64lIleX5Yk?(y#fG)KVkd?GQ^daTfoh*MI&hZ~<{9!k9_WSMt O0000u diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_7.png b/src/data/minecraft/1.7.10/images/monster_spawner_7.png deleted file mode 100644 index cafb25af6c6e2daf3ce4174d2bbcd51d708f47fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1906 zcmV-&2aWiNP)cRjS$xl&X=C%1tYA z!%yIvJAUHyyyKnI@yYJmMg+L%O0RaaiS759Gc#w_Nu^Hl*m>Bc&!6;Z_fd~^{g;b$ z`{)u2*Qt;B*gjk*=<34_>fc|b%{vPWp#d)c*s=O(jIZ@B5+nf7-p_poIDdDAe};Le zdA>}Q)#5(WAfa(U-@4y7k94?HqP#`G+NaIyEjBMOfN1urL#YF~DfrHh*2+3TQF;H<-(Oj!-n^mR2kW%^ zuuWU{mKgv#IKIIENU4SG8dW<5s+!b6^mYChs!f94nQ?z{lOSz)Wus4v{W2XKeKBNS z)V?`OYd31t-EY#~;VO%-pKMU?-aIvWK9$>f&V86KuUz0dTI^qCMKy)DF3zaD7l4gx zEqfO8FvlPK>=~Peuo5_5da%aVl}?@(E>x-5%u;Eo$C5_invU`@b~}{os5ggc4Nx;F z0rPTBy?8Ou^XDA-?fWZcFPNiXDMz(#G1jo$LoEcJ0Fa>Q&&v1}HV@(cv{xDf0ILux6Ew)L)G4Z%h9a&HQ^2@4WZp=k4&y_w z?e{5lb3P~?h*pmxWGNdr+??c0d+N?}h3YXh3f`IPaB4B)=+xpao0bZAyxPL+I#@4a+0H`+S2k$Yr&XR~rak7!EEgM;F5CA;!8uKoIymq1@hM}kx;SVtYxHseZ zu`7c2ko>h#G&NAn4~9d}4{YJ;_s|j7UCAx(*czDj>lT2!PqlFZzbuf+yK+dcZ zJ`mRcuxa20HdRjSMdqGFTnZfK1whg)diGa&?zT+y8sY=FDc{#;5zI1k%j5rbK%|zfNs42faLFz0Q7K{_59c(9vUUg04GCSBEXc{ z&g1et79hND0m3~5rqiYo2!Pap0Pv>d1rq^aO2sA@KaB>1LQUt3tf-AF4nVg~y$|UA z?QTMG(bN%_-4_Bt;tBvjc2oe^Vx0isoL8~?fd)Vdoy`;`0^qSD?+fB*liFqfM_rI5=QU3gB*J zUU`-$PhLSX6z5&)6A3B?U_Fpmw-Hj08zP-66xQbU_g8s;<*0I-*wnM$h% z@=9c`yTcs*PLCWg|JL79^RsTH&War7g2C7vwIaAiky^vWa^z#88`-ndGXzZ(@lgi= zBB#<2AQwJjjskF>4~Fx95OtV8wg1$}w-2&Y%Q>f>k#)NL_myC9BI0gWa#QS74|!gm zb_X>5^<+2;!Mp$rMcj0hk-h!24*=-YK`YgrO8}yF-jOZweI5c4)EYxIpub5Q>#LCu seE>kWS^&fq?MHn``*kPF{}1Q*7b2rUaCwehA^-pY07*qoM6N<$f)wX^(*OVf diff --git a/src/data/minecraft/1.7.10/images/monster_spawner_8.png b/src/data/minecraft/1.7.10/images/monster_spawner_8.png deleted file mode 100644 index 2904dea6c7da7c6bda0a86b1fd112aade5cad06d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1681 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 diff --git a/src/data/minecraft/1.7.10/images/mushroom_4.png b/src/data/minecraft/1.7.10/images/mushroom_4.png deleted file mode 100644 index d0d577069379340c7c31f68752dc5ce8f325df97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1186 zcmV;T1YP@yP)9PnKR+CX_-};2fAhFTP`Hhm6&@2j^B`YN_G*OM1z~r> z?h4QQcfwB(Y6JxVAZ4G}@gL{ULi}~BK)ffI$@}f>AS>QG|Hg!0o*&i-1)vQ)Q2-!} ziqxI^ezqUtMsp-*2Z{s;?GO{CD}LF8w+s4u`W0_3;Mqejz|R2ytBwFbuADM>PA*?M zHz56zPw#e{&>6>A_nX2 zh%Q`zc==?t9twzl!KGTpl+jc*Lg+3c2%;;j@SjiiL-2bR@7<{%F7@&NgGcuR z00OTm0AI|DYHqNS{7~EM~%^1~KFvKGuz6fB{h-VCU)@m=Qz13&AwJT~Zf@-Dj zYc)e~wW~(7MiRga03h((tKBM+0%I$x9oPeaa7Nz|p9G-D7hB6AVnE0fJ1)nnMybUh zOvT3lV5Ka;(bh@}0I^oQMy}3l!_wX30$6bhqQ{B=UTv?28~^}Zj zxkDbIzLQWN;@D^Y!*aB&;Xfk_A>fb_j604}Tm*8g5kcx9LQf#;r}l;?xBmU|&OTWDf6MJ)dv zIy>M2Xn3Bsp0`O0@%nyw4s83Y%M}gw7z4cCc@V3dNC zEt$4_s$D{<-CmvO3!aVeTq{rIR38GwnpWi`brv8N9-wV>9sn&<8GGbr9zu7TMs3aK zcrl8U)m$~g%HiU$j|Es?n9l<==U*#8Zm0D8s_{MnVwJ_SkoA6N03@i^eO4W{jI~q@ zz>Wpl15#r3ShfmXN!qahoqY(vuokiwL#eeEp(QjAY!$L)w$lz+0PAs#*&e{i41fp^ zAXP?LY89|*as^QY0MBC{YH#q3(A162u<0Fy0DxzKN>-K~noZ933Y@Rvivil9F43s) z8Qn29KK+c{0Zyfw&=em7u;&+9hyXTO)jHDx#AclUv($5&ToC{S<;G?J&AaKs1Yn<_g)p^hV~YXAIi_g8Q&LInCpJ%EoR%~20lR5cGTWP)wvO?bOtE|h*@T4{$AV;e_|`V z?ngX7vwyLl`023$mpL(G$rBIE9fuW&Zb?KJ*yiE4`3#Mo+opbKG zs-T48h2VA9s*Y6U?Op7lWU#g&C`wcC-S+;Er@W0g&S)*j$r3$lDPNiMFn5m;hmQJ# zsT;eZmhL^S&E(Co<^H#d`}089lC4X1*hrEVRC2jDLNQcC;Bs;FAKDrhO? z^5ZZ7j0RBsptdH3gdZcmAxd*vY+ z3XCd%Y^sYM&v(hX9wd6M*L!6sFr9!`#`_Lw)(E^r?6{G}G&Pvyvm;%uPpOOqKM}Zjx2qA=!XkH;*3fC;M R=D+{|002ovPDHLkV1k0BaU%c# diff --git a/src/data/minecraft/1.7.10/images/music_disc_2.png b/src/data/minecraft/1.7.10/images/music_disc_2.png deleted file mode 100644 index 4adf2e869b174158056ddc7a5b29828c42893188..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt{hlt4Ar-gYPCv+dSV4d#vyn^5 z?usMh&kL@<@*DO%y7T$MN^6_ou+8TDE)|L$(Li7p9|j7zr!J-T-&v+Aj;BukiRfZ5ikdHv-@=iJ}?>fm9z&DnE8 z$(G5o=Zfk!_(^r1Zm|B0^{g6@~O@V?2HTy4L5BV`JK+Edp~Bp40IQRr>mdKI;Vst04Bp?)Bpeg diff --git a/src/data/minecraft/1.7.10/images/music_disc_3.png b/src/data/minecraft/1.7.10/images/music_disc_3.png deleted file mode 100644 index f4f0994171e3d7f65fd95c4e5fb46590dade0d5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtU7jwEAr-gYPT$CTL_vV%E|cnn z3rEzqG<^BXe!oL@uWQk#qz!!k(wF$^G?%G#8{YCCW7PqxNL)+xSg7ilgvUYsHj;g>L_Cv?}> z3fBbA#$UH{=k7bDk~jBVsXWUv(G{GEZ|+~|Ui;+^`;@=0?JnKdV7kXNtw(feOVBy5 q>vJU-^BV&vwcWZVD%002ovPDHLkV1l~`V(0(> diff --git a/src/data/minecraft/1.7.10/images/music_disc_5.png b/src/data/minecraft/1.7.10/images/music_disc_5.png deleted file mode 100644 index c5810c256b0ecf2b0f6e39f9ae1539aa9d5ffc28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtJ)SO(Ar-gYPCv+dSV4d#vr*{J zLcXX4n?oLdJE8r;PF=T+!y|3UUj^y69w*YBfEs>;uY0}9zxlv#u?^3F_(3FB)NW&t`R>@yo%#$Rdo-H&^KJO)o!KbLh*2~7az_h2jl diff --git a/src/data/minecraft/1.7.10/images/music_disc_6.png b/src/data/minecraft/1.7.10/images/music_disc_6.png deleted file mode 100644 index 3c70e1c3b0769450accc3b612e58f814cbc61d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUteV#6kAr-gYPB-K`tRTShlgWR< zL)j^rl|FWp&ri}iXR5BRCOF}Y$881aw;tQhw*Yl~SifY-t*Z(jJ~MfB2Az6Z6D!mx z$)x-=Ypwg9()UuXLXD}cQ!aUR9^X56S$Nze$AnPE)ZplMV)ss3%5QwFY{ZeHZlJVy z5A)vn;Vjz(Hk{9U|0Ptd@O{blT7ihL1479;>u=27+cSrK%HLf1m-!-%H<{-3h%apk tI(PcQObH-w{-il!e2ua!K$oO_X4zRSe6Ii56Ja2a!PC{xWt~$(69BjyVe$X~ diff --git a/src/data/minecraft/1.7.10/images/music_disc_7.png b/src/data/minecraft/1.7.10/images/music_disc_7.png deleted file mode 100644 index 93f64504afd190ddc71764df2a1a5d93639baef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtU7jwEAr-gYPCv+dSV4d#vr*{J zLcXX4S4}+P9KTy;p0{9{B$;V{!p(ZpTVqW|28KV{*Gs?dc6{)hb&Al|Yqx*yQeo0& zNjtUmn%kbz_foDxjk&B-E_ro^zfu<4EjM*~iolIfhnrWlqr4A)_uZwR0cy z#q-)s?i@GL&8=#uddkdww~e3aHdjQ^xxd2Io2SqG+^}i?TjjsKN*kgMO#ZlNO2Dbg rnO4He8=@X)o=klzVBrXKcY_c) zpmkfzj_-bVcd>`khBXaAQJNp6z8dcRG>M04HJ66--bG8NSZ_`dxZ#&DttWif_s?Ai z#F)O_eS3G`DYbWZ-)-Y(I?WXkztZ3(Jgh6k&k%sIc@@xfOnug<8~kN?C9HF7jg zELywO`d;ySSy!RPRMsh%yf|CqDm~d6Ls_Tz+Inf0r=3*TF!z9t$!f}#_1D(H*DJfR{3wQl7Q}mlNEtp8c+A|-0c+X5SyVY i8OGNr%K~)oqMZzKiKUke!z$!}JO)o!KbLh*2~7ZVd|b=` diff --git a/src/data/minecraft/1.7.10/images/nether_brick.png b/src/data/minecraft/1.7.10/images/nether_brick.png index 46e6bc04fe4a4965561c295a9926cb5521ae850e..0f765adeff5b2fc3fd76ab00c0cc44711a3a18d1 100644 GIT binary patch delta 1334 zcmV-61}!GBYy=CNkl;m1eMX&|aXxyTS#&~7CFkblo z|4*GW{Z4uMGT#C&U}BRKMdqXDnR&M z*giiR?Q}ZaiaY+{Y?VcmCF8ML{W3_bD)q^^H7x+Ii=k4IP5a~`$gTSbYVKJWQK8Ddb6uoAMKsa=fyJXQ>B<2F^3|+ zSvp0DeI%}tMvr=%Mu1swuo)fpYLD7xN=8_Lyq4=qRqJv*%c?tZ{~Q^&8UbER=NZ5% zy(y2Jr{s`g=_~>2Iq!I>j}UfvaJVzR=nu160p6w`Ab$x!|29Vxa$FOF&8n@!5S%9( z*YzJBWC>t7nq+kXSf}GOfMo~)5rEycuEW|~TQ@e0jZ4e%bgK&BB!#!s3a~n!WEnuG zQWsivhT;s=RupL5;bnk%ZrgoEyN#ZN3x0G%d1u zeSKL$7=J_n45_*l+~kGlpyg zc$%h2hKS4wz&ose)7J!GvP-Y$XS?Tfn5FeHl7Gvgs|u3SW(QSx_#`Zzkl`8uo}>pH zKCvfAB>?A$0eF%Ol~`3IeP8AW)lM5Eh8T097C`11KCvgfOR>!pF+faq1LTSYBcd)*Qu%)z}+-(}aF@P(HL&RNL$u8;d7irDQ z*BW8r^m{|xxdt*V~(iY9)BP9 zu3alz@5B~oAl7%zN{n|mzc|dra>%bs;c|5FC~Ma*D)UmOM&`?lyROS3#|(CAg2fXl z)$uw24{|cU*Dr7%?hJ5=j!RQAIZiO+FwB(zO0!Vxw5&vfYVPOsTI$fvALfQ#jb)J# zlU{#wlHQP2DfW>j0Otem0R||Q+J9E_`=60cYC#x60`Q5H!Yamo>5ABNr8MBJKcy}~ zaJQW+0(jg%x;B*(AePX0(~5a1GeJ`<;*4@bN srSVc|#ZjWuXFB)o6#@SL_m`U2PZ`W~&UFx)djJ3c07*qoM6N<$f?er;q5uE@ delta 242 zcmVG-MDorc>e?GZkU22 zGYn~(_I>z^LfX6+l9H|?gpf^UJoKMmMF4?6aJtXoEPY*W(qXrkBCtw|Y6w`M(TOvAU4wcSaUz4jk_4;|&1(s#$Ll_hCn*9=2v`$) z#zf(wMW8tW52)u|y^o{N;om3%a|!5&%z4moQBVuc>f|zqKy87jOy* sb4M=@hd>JgmdxVd5NJVw5JHOO3)p|K>=F50tpET307*qoM6N<$g31AFSpWb4 diff --git a/src/data/minecraft/1.7.10/images/nether_star.png b/src/data/minecraft/1.7.10/images/nether_star.png index c17cc74173afc158e864e191223503c987af058c..cab78409be2dfd0e15876af0a08abf4461773818 100644 GIT binary patch delta 1235 zcmV;^1T6dC2j&ToBYy;~Nklb#y~X<)PFNTGYfn+`6n(-{e#QX z&w9rI@&F3NF7WN_HoiN*BR}0Ox*#n8`q za|WtJMGLk=3vSU&XwYn^(u}AOM)08Ulf#=cU}c!*uy(WW2o`eWPh$jsH1wll@CTeF zUXRe4m0>&fPR_6z!%QB@bvUr_vgYc-7On^>d3|kh2Y+*+3_Mg)Ue9&-yf?aMrlW?f zuuH(@16lW!*Ss>ZJuO$}UHX^zi1+DuK_j?DC%M+DBUlB$K9ciC zev{r!aMBhcdkBV$R93sRALgjdUKL*2fZ2GP>wne;mQ8$uVA&i8?F{G75FgN=KO~J0 zG;5AvwE{J#@A69T5Zjcr>!GXz&j^n&_woizTRS`WeMgtzhw#JFl&vQ1izCv1Or5BZ zRAs>B;0SKr>nMpus(F)P-UqxNxCyjH=N!Qv>O`m71Kgu|*zgD1U4oZ7pHzY+@fuUZ z@_+kgLX}SAc1KCfhw_ftsus^C=EHfSAkXpAbY@6%YMzBpSuMa@Fwm7>c!woj8 zO&h`dnSw7w&j`I914gjj))*t0%fT)QHMS3gV5CI*pd@>Nh4ZSl_%x~ob7Dq)5n9!V zOyK|ZFvq6Mrc3M2#HjQ0pYZ}su8E(t2FkqKNRI;qZ+7p_GUp(Hz63w;gvAfP?uj_6l0y?{l5xl(AzMbY9 z30L2ZPK~ZO8D6;s-1!Aa5Esw=u1s&JpSarqXZX{J$0GRNin>zdJ5j#S{c2`Y=$Y$v xBeW;O-%e|V&WHSxUX_5_pN|pkZ25u z(u1p9rBp#qLF5obsGKcr;qjf>neD954^Sk#$-c=iJ+j+#YFNg=83{jI z1|q~T2_Is#Sja$_gol@aQ(};W4=|c7WZ;B^pDb#4n>9REGH^`7j|843z%8(hfy0Fa zE)wo)1o|6IVgM<`#|EH}Q4f3&^w!_8u~ZC5!M$}r5AnVhcvoW~15)tYYM{F+j;^XG zURQ=;I-!UP&VP(wuLXhCX<#J)EKdQ8eqeqQXf4}DOX((>N`Al`2ExRtKnW@M>jW@6 zPMf_k+B1y;wa#T!7tN!xaMmOSj)^1Ij))85oQNj`Px)xCG(vl&VPJF!D9;a|G;adM zxudBWU>D)UZXi0IP3L7$>Ntdh17bhv;U_=I;}#vYNq=qD9mOYCgp-%$*15icm=GVm zfq}?lN}WfPHV^5;HnG97KFPrs*jtB=6mK-(x`6>!bP#U$)><@I}y&5-R+6 z1X8dR&3^ zo!cFQ*8`N~j-f2ykBWln)C{mbTwlD(+nU-X*b2*{6DyYg8A_(KVOo+AFu$MrB(o${9vMwpTAMb$=BN=p7)Y3uY@U1+%-xR=Bco#vr)y zHiwrQYCBU&ZXmAL^WZ>Yg?U4WXmuk6H`CPR)3 zbbq$O4aMJYw?I<~HHY>25K6KeCF-c7F|#$!MROQXQ{pqt2}W?#xP@lcHt zNe|-#%9MCO@tNBITj8e#K`wZRrtg3k@I!dckxyHX+^l|NXZBg=?{z6SGo!~kqSbIb s=?2HqZA}B|jyFhmbaB$`u)}=u7f+2+^|UiN7XSbN07*qoM6N<$f}EerEC2ui diff --git a/src/data/minecraft/1.7.10/images/portal.png b/src/data/minecraft/1.7.10/images/portal.png deleted file mode 100644 index 115189e6ad90904cbac9b9501fa35d028e6e0811..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2897 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 diff --git a/src/data/minecraft/1.7.10/images/potion_of_harming.png b/src/data/minecraft/1.7.10/images/potion_of_harming.png index 0a3ce8d63d00868f8d17f25e2890e7751845a480..ac84c8ea22a8d86eb9bf2b45230987397fa31974 100644 GIT binary patch delta 827 zcmV-B1H}Bu2GRzQB!3x6L_t(|+U=LgQWHTO#(fGeW={y&11HM|P-GDW30qbOvScF+ zNro(BL&XItZ$5zsy?Cd*c(*wD2)xHFF2MEk+vmSZ{JaE^0DnCIKOzq_eSK)v^y&Ux zP3Pz5nk0Y(=$Sv6J3BiA*HGUFB!C2v0RJGsP4BEj2O|LnZMx)$Y7*D8_OPZc+bXtg zVWjMFRGk|*bZw*IPGev&*8@bl0CM&S@{Re++pDWL3CQT0`D5^Umh>)LM)RZ+3aJD&EUsT? zn7(cWnrQkP?A%GPf%kzr-UVu?`O2ty4;ZYj0Aj-8`hRtXdBXIw)bLw>h4uf~e}Ia& zr0LcH#JjARum~U;E_%x-kaPniCYj(w^o zZeDi)u@WMHSc#7L0u*F~ndwSha!=lj_j&&r- zPPRsNG=E(I`l&?PrC?_?hb?ECCA>#=t{l0kiAJNA5W=Q8tQco?2I!*_Nyi2f_BF(8 zG4cozA&(L(*t9No8C^0?W63}@r9S|#MBB5AraOZ=dA^|uXUO9NH5|7tYYDHLo+4qI zVG@ll8YY=ShR6B>h?OWi*P)KYP;`V@!W))(W`CHadzo;89OF#gNr&!DV1en8z5rq+ z_N)uowag)FneC)(oMDC+NiBH7G2^9rlBVY<;Ii?Fz5wEvaljCqDBZJzGPG=-F@ zJ9Tb&mHbNL`oI8aEqKD*aLP2vjua+q?%rV{=I89%h+CG110YIj5j9M(BR8D0JVV|( z&ot_#*t&Nfy5}ctQL_KX^abeWFXBx#6#t1OfE+o4ncrHUDe`rgsc!%P002ovPDHLk FV1k4ojr9Nk delta 817 zcmV-11J3-?2FM1GB!3S{L_t(|+U=K1PZLoXhWQolGy=WNt)*Uq{s3c$i94bomy~cT zEws~VJH1RhZ9y)AV2lx?A+B8L#yxT4-mvl~@IPM9In7MZG!V;zX*K6d-jJN0gy;F@ z>zUJ`AyJ}4iTdyA_xc2!{Fscp`T98MMhFOjt~x(Ihm&95zkmES{C*)I1iA!%&OCJU z?a{ECd^CBLw;l{rSNOPR2jt z)A$F^MQ#7iKKA0f*cp3?Mzo2VR!3E>VppqRTP1Vc9^MD$%iJV-7E*Jb2=w&2m_jS_UtXyGxE%HXTl#&OOf;;h5fFFs&u@+v( zn(R$XJ6tDYL4ged>vXuHbm9?^@@{+;;74LVT7PHbvlp$h4%4SYLHX{s;mO~wPCM{f z$?#Wz9|=1DJ6ef_@3by=x=X>G@Sy2%8f&2>R)b6a3h@7|16{z5YF-$AzXQBXPB4DG ze*#>09pLtTKZll_Vb^DVe}Wvr^TW?EdwX(l1lpIotP5O^tdjfw5-Onun87*E{;69} v@ha@*6Bb_udijZX)eOXMVj&<(RDbFZ*#|oH3z;ME00000NkvXXu0mjf^O%kx diff --git a/src/data/minecraft/1.7.10/images/potion_of_healing.png b/src/data/minecraft/1.7.10/images/potion_of_healing.png index 7f6803bf36534a3c2455c09aab7471dea46cfa0a..5218ca51b6a54e7a023f92089b8bd7e51b3353a5 100644 GIT binary patch delta 796 zcmV+%1LOR!2D1i`B!BuzL_t(|+U=LiPg6k{#rZ4TyKn_X+5)95wm_wTd*cg~hY*5L z1*ri=5l}?%f%w2jj4Kzqao@Ocr%j8XGz~6NXG1aSJ5AL%%MB~*sSJn4jn|=DhGBLFDrv3a zj&Xd+Rnirk0i=YL^;CwZ354je zjCx+$&l6tpM!DfxXNySqTYe)J-Swn8#pq4l-`?$6S?ZyNE-mFg_W>n7@m4V9HdD(o?R1D zbZt!MHD?9@tHr#tn#(fG>I7d4sg+kuKK{M4mG1iye4zWktpJ<(i?~%~#D8K9phr)7 a<`p;cee5yop8mT40000}e+ z)1nDY2X_lix^@Z8&dv%c00od&TbWCz)38+5`+x#a01DtA1laD*T6QoBpwy;u{1tHQ zC2;hG?VyIHM?mO4(0CW{O#t38z%xwuH-I2r8mI#;|Gh(tmv)0nycawM+n-9|GZfl=ze#z)Pk*F`&K|8(J5>xjXRH)kgQ71Qg|R z6u@RKaEp?pR`8A3P1jwcqX+WFI#y zj~6nWFVwXQG2=`d?h6hBND0g1TN{rEar5;Z6hap^>3=uaZ?U(w;{ft5E1N3}5W)QZ zGeRukA6lDf*q5Ei0rnRA2_#PQWvE;LaxJlVFoLD(i}+j z2R((4#(xM;m?uq!Wuxo0DXbewtQiSs0g7n}W_-~YCJmY6etO0~W;42~4`M|hz_Q-& zFhCJ4v7je0ugCeDVEYAp!+%UxX55mq08&dJOlO^@JEYq@VGc%ySBF%_nGnBnkp#w14Xk14u2wPnV5jrlh2o^<28lxFy-> zC)X7$)m*}2b<|k^`Ok8u$zX7_pycN*!wUymZR4c_kkZYWHqZMAQ2+a5w&&khoyFX~ z(|EV{R5<};4|iF^d~fh{(^wZRw;i_U-&UT)Ol1p~qX5NxB5qe@@lC7%RH-UW{RVJ` W`Vqu9TrXMx0000U@4fH=yfQw3F+PBIK7bTj(K~?_X|Z4r6pfSu1$r(mg;K1XmC!1Oh)@m{ z6b%sy22nAZn0TSTvv-+cPsLa+m{zk_@@LwaN&0*XrbYP7X#^~5aO&sLX;_4-E{zG#cT9SJAn8M~2yD>|9w zDL?R3NW`*(hj-c+)=dx zXVo&Cl}l7s1Wg>kO9G}%8ifT8JIo5OBhglwlEQX6;r%H^gjZaE9SPaW!+>Vt7tnTd zK?W+qlckj0@P6Sw^46~^E0E7f*fdEgt%sw?wB zry}txFCdP@BlkCqxxQjV_?5ulEfsNNCm$f4l zSSyT$*x^R)U^dkcf4c%iu%;}atN{CCA~5N2(7sF)urFoPya>M#+1wuh*Oqt7_7_Zm zjD^@?5!m0HqFW-e}@-Y{zVi$lOFjD@v2PPZa(sAUyBj+cly*3sK4U;D|L wZ>ks+*8d@81@d`CJZ_5OotO*o;#HXX1>)jO1MJAU-v9sr07*qoM6N<$f>7#-RsaA1 literal 0 HcmV?d00001 diff --git a/src/data/minecraft/1.7.10/images/pressure_plate.png b/src/data/minecraft/1.7.10/images/pressure_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..8a7f056a7548c933f97aa97315974ea92292e411 GIT binary patch literal 566 zcmV-60?GY}P)xf@2mxsbv5l8nGHcfmOh9BJT_Yu+h>cm0Nx{A-ZHZXBsH}bZ=nh@3H zDa6&ik6KHS0U`FiBB{jSc`s%WkE`ygz}AASrl2PB7Hie4z#a6&;qwx4CD!NUPZKGH z&j+wJ5tSA7`%FGspS*KM-Hog=bxQnw6=L6n=x>Jt`o0glSM&IkDe%PR{3hSq@AqW^ zhOX;mw|v)bx7&zFfdA~R#M6Q}|K8EIDGMpWkq8hsfVhDtQ4|28hSTZv zOMuEqZPViEMfPHgM8xq-RRCZDjIf`C$_Q^fHR7BXCTD~#q@Fm7DGES&!c068;sulr zc=jwh%>*Oj!0a8l)Ok#Z@B54>@@?Bnt8i%j`pajcNQAc+G6Es~b!enafFf=%`|$PK zPo)rGokuU$|HZ`ZU z=Pl8EErolNih{n9_nQW$X$tqKRS{~)A~j5+Xlk7=7vI467xk6EK(wX4Imk4jTH@;3 zP|7<(12V3+TbPm7sT5_|qAbE$e0}fs0UF?FsYrD4YUhZR@hX&~Df`xT8o`Jsl0ZZ> zRkR+H!pkChh_dd12Dmy__N7ouxE5N*%NF5?W&)>H)YO_e-q)P%%^BZfL_4{y=OGr0 zvD*_Vn;2noc_!u_gljz_4RGTl12pC8sq$-h?2a(KuqpYv+uy}FwQwvR=AQ{}^1}(= Zn-@ADNGGMFjPw8i002ovPDHLkV1h1c!u0?E literal 0 HcmV?d00001 diff --git a/src/data/minecraft/1.7.10/images/splash_potion_of_harming.png b/src/data/minecraft/1.7.10/images/splash_potion_of_harming.png index f2b90cdee81d69758ce2e482368be684c78354f5..3a7dda748230286c28504969d0b4b30bf96e1ebd 100644 GIT binary patch delta 841 zcmV-P1GfC=2H*yeB!4GKL_t(|+U=KJOWRN!#%0&L+0CwO(xxxgS~rH^K#)xk=B8a= zwePl#eNAnvRa@sK8)IYagZO3qQqTV9qzNaZLT^k9o&!IE5aaWE@=s1&T9QjHx#W8C ztF#$`MLP7-MhZxQ8AHdT%Qod#nvE2Y0{^Y{+c&UyxBPr6xqpaiBL$=Yt=9G?EFL;% zV(28i2P>b#Y8=s+; z#W{@<`+Z$y*ZYj@-j2{I0PgSa{uS z0kL6GU|L|SVKZ!uhaYf~le?JUJi5Sfd=D04!=iu~IPW=_5aSK&N}LBiqdQ=dMxD;D zt0|IAxho(x?09twBT?`WbSx@X%Sj&ioZd?3T86()8{Q13N!N2#KpY8CKpcspl0b=* z$LGPTon*U;)*`X*k{3rFn@!ZRPA=n-P!P)hyrzg1&x4?Rhr00000NkvXXu0mjfBl?uE delta 849 zcmV-X1Frnw2IvNmB!4eSL_t(|+U=LiPa07ahfUYrbkmjAmgg`G;3L(<#8?xPn!3=$ zrc??(knr*WjDW-N2CZ6aO=H@$O}G9t{!^!CZhNnHC?;$iNW3Tc77!l4?{Myep&?PC zM2ULv6`qoTvg&%u5CTG=$I#2lFeBo(F@%5+=&0oMI8f$>AAfh{y*$bg0zv>QF*^m6 zyIwQ-_)D1qebS3v3I_0jnmpbW+yF9iA#dT9YD zzo&n~uc`0wlLfI9Al5=Y?1TMx}a2}|^nZIlj z&^&ukl+uuQCt%kRg|vMGlD04u9TA450`cGqP--|56&wj2M}iNnVu!P?IP7EKT@0MY zz$x1Y6TCpm7GeY!=Nb1dP{fhQ<472Rd4X<$&4e&`n15kB-mynu&#`H(0N-I=pj+Th zH0K8Bt|(O8amcw6aNyp7g0z4C0_)3*K;c801#W|Gy;vh`qomQ{j59_8H*jsV%U&h+_TphRD8q|GNYXy24300{<-q$1;9d7!Y zB=Gh1H6!oUkrEtuHERWW8Hod>juKT+y%o}7L#nEjO#&*uKlcwy1$r5YEOs{|mk^Dd z8D;Ep8P5$~fQHZEs97q&kHkfw0iOeP@+%k}u74^z39QP8ti#5EM==RtaEhe@{78KA zSI9Nu6z@J|E@+M$58YcJ<7Ut)kio^i=eGD9;78)br!j6jT`+Z*hVK+eITN_u#vo?j zv{r!sG8)(jcY?RiPK@1&4^0C{Z4uMw^iP26E)Cq4@xG7SYaMT+RlJSz0_)G;L3nf( zLQ2n821CHuPKy#=?(hJkfpyn5-g!33jWcgwGYJGomLNE6@Wxt!yXvkGy)Y2}iG_eD bQT?eukdjXz**8ov00000NkvXXu0mjfZ3&M} diff --git a/src/data/minecraft/1.7.10/images/splash_potion_of_healing.png b/src/data/minecraft/1.7.10/images/splash_potion_of_healing.png index 8df793971b8c84518dc1b7701271b164565bbd7c..15b28a1c4905a9b8cffc7d9f9e0f907600ccba1f 100644 GIT binary patch delta 848 zcmV-W1F!tp2ImHlB!4bRL_t(|+U=K1YZFlzhKp-AZd_Fa7gCB%OftDQy=c{fiwX*L zVK13nnkH$JHoYjtq7+0a7R2As|6%K{J9|+SK|~kUiW<{uQ(IoYbLPSsNgcvhV4~fiegvDmGnFe09gL<)*daQJ{5)Q1+uk%v-V_gvP==n$ zFn?;S5iESsZUM2wqClm4)6J1h!_fnPcLbozORi=H?S z%%1=!ixRCbDMKVXWUqkOVNpOFiB-n{R-FS_a}MfVPV&GA(LM-|@IA2Y9p>!N{cIHw zM?w@3M}K0?8O1tBnIBwn-(5>XE8Fo(h}E-sp^UrcGZ zhV2!oW+awcR4h4SSSDD98GmTchyoj~w27?()r`clBaWAj1cz<-T~5v-@Y5&Cy#eZ0q?z2_6mq2fykuJ6z{Oc81Jsp;XQggvzOjJz5GOh555_E^v~i`;DNmY z;+GkLS$EMktsT}l+KCe#vzE|C;LpK1%YAAlpmkU4un`!Y4~aS8(j(yV6N|u?&|_?d z=Si{E`m{a-4noxJFa;0aHv^+<9=NgqTzy77w+L*tF5sJvtpbPDVIiuaF8(K$0%k~aB?j#|4bzRO9f#6-Bg1Q_S zGYYu6spBEQ(ShH#R{XM_$Ip^xI@iWARiLr177TcYsgpDc?x-=ed<~GU;IF+6%cU3a z$JTNVie8URNZo$FnHful7+F!Ujf0*Rn=#iv!~EoapZE2E_b_Vv+D6r~+%h$IGR9O+{B zjb=)qd6fVgiMJ)KcyDdTM_Y&5VYvIXz!l?k;oku&X`A&c+bsQEHet3vqSLD`;`m5> zm3r`94u9i^BdT^-38@CIdZ2}`yhrD5(R*X&uRuB@u^>05ch-C9hJsngpZZRpIz9XGkyl=M<&{@ndF7Q?UjN-X91ex* zpEG{D-5zv0or2!p_~mj5g6aGH9)#=b^%}IsBt)iy9%G)68eGB}@lVF^N2|%;fJa(f}hzVfZiU5RE5S?1OBOC(b@%T%RD*(f)JE1w~bUJAOuXXH> zSOC7y1AnpO5CAru6adt`4KVIi0zl$0cRgWG{g)j z0ctm%0*Or|>=*#N`OZ@ns@1p$!ob@pr2yLRcp!t4r)u5H8^3l6aiS!jDBl4@+Y11H vWhxxLx*Cl}@tusIWq#E-%~P*H{lxkM8zWflz+33d00000NkvXXu0mjfJrj&2 delta 806 zcmV+>1KIq@2E7K5B!2`+L_t(|+U=J=YidCh#Pgvn1PdD>2wDgdv9PlcY%B#4B~5z! zR5q4=L&Gdg7$;}vht@7-wZ^mVbsR8rS;({P7)OCF>aH zYXIPDcLzBf4i`ub>2+j00>U+6@i)KsuC1b`qRM-a^}a*?vmIeLBja9C3Pv@|CFA-T z-H~sHJu*&H>|P5z@ zU~)SVWhDBHet#Ez4Tr-^5#aUpH7N>hRIwaHbe|Bp(Hg28d0cAJ)YYw7EFylKR+kk1h8B#uOJ`* zK%SA@XpIb(a#LlT>i7F)08|_RtJNyWK>$GU2TPMijeq9O1b)wCGD(7Q7=_e0)oQh> z0SMs$5bhB|!=4MZo*`(@6=DK-TM>Ye3Zhd>cZ5S=JRX1PaRp#lbtg0j-EOxG5Vel) zhy(C_5r2q}LjZU4>0c40&p132LPh?Cz|0(|or)!t{N)gar+ z72O9wuHxP*3cz;q-6#U!$48^lmv+g88q!_i-@Il>)o@f@zYp^YpyrDJSOB1+_VFrv zMpQm!Sn=GBcoz8ncDtQaX+8oO3!IZ>#a8*2abJW$RkckNz{5@e4=#J$p=i8TtJGZpp!|UI#}ExM14@9q z8!v(6CK7fG0MUHssS4fIcm%@0`;<}u?RPwoLB&(`-YXivK7}|@icge}0HW;$fWI;h ke;=Z?AhgV{GJfy%0T!-N^rx2cegFUf07*qoM6N<$f`y5Am;e9( diff --git a/src/data/minecraft/1.7.10/images/water.png b/src/data/minecraft/1.7.10/images/water.png index 05ab8a305abecca8d8eedc543c9988f9df323a9f..de9c270c64c6e90e01e5c64afe7f8f53887dd59b 100644 GIT binary patch delta 678 zcmV;X0$Kgz1-=E4B!7iTL_t(|+U=Q5Pg6k@hWR6wmO|~v(}yI}XVl?{i4sSXbj>7SCqx+_~>NnK^Uj+_~1~>6Njt^8VDQmv4`a z`DM`CJ2YzDiuq#y$f!R$7#hvTAI^=&%E8cZW0n=v(ApS|jDK?H(^q5T&5vKkTsDx} zK&=x5M7)R~KEn1!7`UPme?(@;aV1Kt~pg9{zZlK-|f+Kw3#Rb6;wl@bMJVs=QL|+Z2BGj1;BsZW# zBtC{0R3Cmoi6DL=#K{e9YC^Mt;^;O!zX8BV{tu%$_SIi`f>&P zcVC1PIa2O?{$@1S!q|~)Ai06|vx^&J@cQ>Rpxhx1WY5_+*&fB!8+&L_t(|+U=Q3PZU8AfcYV^4;FTJ_5rN8puE%=ym0VhIP%|& ziHgAoX0yCDERSqZ6GDtJUi>lkhN+pa$W$Co?V%6ffyuDbU#F_Nt9zpHWH1tD7JCDs z*xuPoXukcF&`K#Z-h2>>ZTBpuzOp||SUWsRSWT%s_y<27>e_7AKjk1qtannA$306#_IQ=TjZ;q}6ewXi8AEpEW?*ghss>3XO5Uh=6N2m+o3{sIVpBi9H60%QOH002ovPDHLkV1jyQTKoV2 diff --git a/src/data/minecraft/1.7.10/images/written_book.png b/src/data/minecraft/1.7.10/images/written_book.png index b040be7333d9e075d271156a2cbaaf7d2481d0f1..0c73de1a8d8b88264fc6cb7d51c7e380fed31c7b 100644 GIT binary patch delta 2496 zcmV;x2|xDH6v-2iBYz2yNkl06ZN6^HpZTGzUy5k+T z`vMsp?(=)jbDnqJadLY5c>9>!k23Ejlz7#n$g>WG9_x_rUVn*Pw{m2=mLPMr5eAn$ z%;^H`3F}s6L%T8qDb9K%uSlEQ1=tg|Wlo4XO897GrNW2t>lF@$nTT>h@(QiO8!Nz3 z!qx@UDoFW5;T57-F52Ld|KK7>n#1GtMG@w&e=rQ= zE5m+K$R{bZ3MqTUO7MAM^jr_4M=kybNo!|do3IoQ#BG>L+G*7i2ZOd^MALx- znsy9p+C(Ay12j|5utluIU_dhl0-7)$za3}dyD%2N%}Ux#H$G46MuB^^!mJCB!aUp6 zQ^H;k^H(X%g{WIX3J*{#_4_xV&%a*4;u0xr3ybH`NuJ|Y=C}a8YbFeCxyW=cuo8AO zCDc89Q9p=_x&d1LetenUFABS;--olwyKt6TX@4qd2PTuYE2tChTf5ON=hJrKoVE)e zr*6gBlr~Hzw_rT630h|ZQmCzy-c7MCCeO1B1zr^}de?}A3u*Hddv0(zCHUvRPahP* z7t(qusl8Nak5vz=rOk9v&v#j+D}{U4)}hC*2Hn1u*tMoy5gtpZ$0&{F({VL;KeiHa z?|;N1dU+J0mPc3@P`aibCf_Dh`n8JrE9bDIDZvTLO?O_~O)IrqpzdKQYzvFagr)Ef zpJH@*6{6EK4;>y^itx#pG8~UC#<6IlAZl4SA_ZaA1=RSrqk3%{s@86yKhi^!VGm7) z?pe2lt*AuZ5+|b@aUyC1jz!ce!foybyMMyRq6#q>l1*d@8eC#g?-C>M{#6LP1i^6P z8v5f>XI~Bg%XmP)4ovQQS6+#&rs2+kX<3zGj_()W~naDgGCi;U7LY`NE3vH%?H@POm ze?c4q79>KmFd0rIYc@b4jL8D(P~uZ(B`rA}+wQO>WDjq4)7kA|79I}E zQLs(;aAdCdo)aDlrQZq7Q-oXTHMh8@qs=1&?euq^{uy{?f#r8re@KOVKn3`iW zrU-BK%n=)%;qRYN@{fr}vP!p7KPqb$oDcS!bif_iAtYX{=-nP z5d%Sa*r&->dbm%MX(gLDj^D>0$M50F znLFsHIE;4FA+(uB;FRrQM1Q7RJ`AooG$G1qLX-&Md($s*`})tgb^V{{CE4D<4D2QL zXO9K=6{_Rp3^-LoeDNluJFH zk3niPbxRzNs-``(PQdb`@pa-Inr*@@uBk%i&h=kZ>E2KhzBBy`@q*gs1r>H%z^lTO zsl`o8uc4(gAVCmFXMvMuNfb0oA`wXJ3D7AC;~C8SKq*<$;(yIFOeg7qP`;y3Vbv1H zBCEt3_ahM|Q5a9EQ?V6_aP#UUnpz18oG=H%!kqBeg4?3sc~$stUKzhj8~3i*yj(no zu-RRQz=cV4h$Wd1GWCOx=C$)<#PV>$`$LL_Fn*#!{$hrw(^JcYIuKe$o4!>1o^8TX z*ilPJVMYowt$!lrG%MlF?s`R7voHlg%%W6*RRR19{KMcyX(Hi6VO0Vl|C1Rx*0_fU zg9~ZA=8LwnO_!3PCE@#)73SBJ!dnFCgh3pZQaE^#R)x)7y|BdwFrka} zG*V4U!gx;dKbnzajeB^XCQCsIH@hYg$;zg4)DjGj%73d9_wm3I3L}O2d@!F8nF1-y zga~v9S*&yXPK`GRZxr6~oN%8eM~EtWgOEKe6J}YpFryacgjx215VcNN3fm?ug=hVq z*l%7meCI_9%qi0;Oz@_b*b~05f`vKZs}m3CaC)Gm%x!3!u$inG37gT+z5rj^(7dVr z=10?|Lw~MVg?_r6Pzw0bzOYPK%3hmzM5ik;`B+>@KDHo*nGQj=xQi!+LoIMiNBk!1 zzq?1IJ~#%03&iGS#J+fL=9)Zh0{hmX{&vor>3gcUnCq_(W#-D%Lh(DQugt6nEvn6Z-AsQ-%jUyK0UrQ==EE#2&b*6gU)#)^v(@}Iq|ue zy*VDX6`s?dK-v?Q2{Y+)C25CuuZqt5ORJ7X9VMsf}k6;z@D z#XM#Z0Ywo6MKNJQvg8~DBG!<-bpsmBhv&mHzMt)Lj$^yQ3G6V4!%l;f*g5wUcFjGF-G6h>VE4SU*fTF4<9Y$Q zg!jxlhrs#g5j6h-_Aar5N$OiMxJ%c(8I1KLY(ykdP`&FJ%Nra*FdDB(s~?`8o)SZq25 z>#z{kPPoeM8Y=B7QDIvl3$smpZ&fGmt?Z;t-NER z(Lo5|K~60OI5pU};4*?a3HlchZ`X#ib}cw#+pH4SHzkxE9`S9bSKdan;?Bx83BOkK ztf(Vuag(vU1~-;hbCd}eSY#rflYuNc94uElLn=QH&!NG#NY^XmiyQb#Gk>rLgF*QkYeu#jOa< zoI+VR)AX`V;m&0_sC7v}wR0k>oDy(x!4aIFe;D!e4`RumgW&e3-EjG42Q*RUg@1@L zFF>SuK23#MnhG_vxvJl~5-i~^k8*Spx;o4%(d3$sM%O$}hG_yaOfDha`(qJ!6%-Ms*lQzSC;s)4$y$+g4vpgI&%O!GX zB3whq(kiqst$gcBuv=$`dkNYJU4I>B2{*Xppw1-=wa!T$>0SowW_oGq)gW#s*k^=?C*KykYYBa%dtXSBY}8a?12pLfK(m!mJXl?s+7bO@bL?5*ETN;bQw(F3b{+oxM{fe1G`+b@;gp zc-jd(?f?!2WFUN98uqWH^WmUrCJvfp5Laa37EUR3wuJgxqPG&F!wg*=X2Nx@$<*aU z>hh&A30FDCp~5MaC!B2^j!dgCS@_WOH8?QM4`EZi5i(^39<>1vTY(2HK$w4`j3(S9 z9S1mRvT(CoF`8(zHMtg2Uw;erRzh?*%{X3XhnaAN(^-@|o}wbr_nD0WO*)~}?_&W~-ed~t6zqoRkxZuqKE<>~5I2HSiQxImHEDJZf76A7F z+>@wx$))a6f1R`C4p%#+s)UtOLRkr2!ufWgV-gm^4H-YmD5a&pdw8Nr{LB--kA_3(N7g1(^PE`rzlu%Ye2_18)vG@--%mz6VS&C%2w|465PxPBWeLa42~r8OgG~stD}>#| z^>mF0kggKShaJsEpSfevr*1sqxCJY@93DePy#QYs?Sw;VH1413qqh=6#cvYEtv3ka zW3zYQ*sSe*IK<5QK^C_8daVl80_J_}fVqFP=P1+tZwp|HWQ!HT;nP;qjQ5u}oxVy8 z6GJ7^LVwsEd(|U-oe++u&B~_Qk(rx0YH@$qd?lgxJ2hz`b{u8WtVX;}qi;Ga68@!I z-C_jEN$F#hMUNiB>q7>(=E(VRDvaZn;0yX zzK%_^mxOl0>ZIQ!{6CY{_ZZSXF#gN~rk}5%4S&6ZM(1uCp?jst#3s}W-NGVaQHcTS zdq2@vD2?IguThI{!jTyg+TvC;R4l&q{cS%ZQXU*^)Mi;m(zrd$&j`Md7gEA(b1H=y z+6fC`ZP8zy^#AiH4~`6rL;Rdbw>TiZiPs3>UM;i})=pX^Z1#nh^bN|pc$5bRyF#Rz z(|^^$EJUi)YqZ6C3na9~Bk8Ub@%>s^*yz)xSoDc27JTf4c{DiQ`A?^n(;?X`_%(aS zhzhh57Q*lC_W;T%kxZLfpq=o+>8tsDUprxgKiFXQ?=9cs0u&pLi6_$KF2Q7{EF3n) z3nAYvNAS1q2%_tS5T5ZnQ%wKJ2-7}V#6lStzZcWhVQt}Y{ToPK!Xn{m6Bc4BF|HS& rOL*#p1u|16%pczi`0#vqG@Aba)ROjC@8Cv(00000NkvXXu0mjfX_WDt diff --git a/src/data/minecraft/1.7.10/mod-version.cg b/src/data/minecraft/1.7.10/mod-version.cg index 037f1206e..c04438bb8 100644 --- a/src/data/minecraft/1.7.10/mod-version.cg +++ b/src/data/minecraft/1.7.10/mod-version.cg @@ -2,97 +2,117 @@ schema: 1 group: Agriculture + item: Apple + item: Baked Potato recipe: input: Potato, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Bone Meal recipe: input: Bone pattern: ... .0. ... quantity: 3 - + item: Bowl recipe: input: Oak Wood Planks pattern: ... 0.0 .0. tools: Crafting Table - + item: Bread recipe: input: Wheat pattern: ... 000 ... tools: Crafting Table - + + item: Cactus + item: Cake recipe: extras: 3 Bucket input: Egg, Milk, Sugar, Wheat pattern: 111 202 333 tools: Crafting Table - + + item: Carrot + + item: Cocoa Beans + item: Cookie recipe: input: Cocoa Beans, Wheat pattern: ... 101 ... tools: Crafting Table - + item: Golden Apple recipe: input: Apple, Gold Ingot pattern: 111 101 111 tools: Crafting Table - + item: Golden Apple (magic) recipe: input: Apple, Block of Gold pattern: 111 101 111 tools: Crafting Table - + item: Melon gatherable: yes - + item: Melon (block) recipe: input: Melon pattern: 000 000 000 tools: Crafting Table - + item: Melon Seeds recipe: input: Melon pattern: ... .0. ... - + item: Mushroom Stew recipe: input: Bowl, Mushroom (brown), Mushroom (red) pattern: .2. .1. .0. - + + item: Nether Wart + + item: Poisonous Potato + + item: Potato + + item: Pumpkin + item: Pumpkin Pie recipe: input: Egg, Pumpkin, Sugar pattern: .2. .0. .1. - + item: Pumpkin Seeds recipe: input: Pumpkin pattern: ... .0. ... quantity: 4 - + + item: Seeds + item: Sugar recipe: input: Sugar Canes pattern: ... .0. ... - + + item: Sugar Canes + item: Wheat gatherable: yes recipe: input: Hay Bale pattern: ... .0. ... quantity: 9 - + group: Carpet item: Black Carpet @@ -100,97 +120,97 @@ group: Carpet input: Black Wool pattern: ... 00. ... quantity: 3 - + item: Blue Carpet recipe: input: Blue Wool pattern: ... 00. ... quantity: 3 - + item: Brown Carpet recipe: input: Brown Wool pattern: ... 00. ... quantity: 3 - + item: Carpet recipe: input: Wool pattern: ... 00. ... quantity: 3 - + item: Cyan Carpet recipe: input: Cyan Wool pattern: ... 00. ... quantity: 3 - + item: Gray Carpet recipe: input: Gray Wool pattern: ... 00. ... quantity: 3 - + item: Green Carpet recipe: input: Green Wool pattern: ... 00. ... quantity: 3 - + item: Light Blue Carpet recipe: input: Light Blue Wool pattern: ... 00. ... quantity: 3 - + item: Light Gray Carpet recipe: input: Light Gray Wool pattern: ... 00. ... quantity: 3 - + item: Lime Carpet recipe: input: Lime Wool pattern: ... 00. ... quantity: 3 - + item: Magenta Carpet recipe: input: Magenta Wool pattern: ... 00. ... quantity: 3 - + item: Orange Carpet recipe: input: Orange Wool pattern: ... 00. ... quantity: 3 - + item: Pink Carpet recipe: input: Pink Wool pattern: ... 00. ... quantity: 3 - + item: Purple Carpet recipe: input: Purple Wool pattern: ... 00. ... quantity: 3 - + item: Red Carpet recipe: input: Red Wool pattern: ... 00. ... quantity: 3 - + item: Yellow Carpet recipe: input: Yellow Wool pattern: ... 00. ... quantity: 3 - + group: Clay item: Black Stained Clay @@ -199,108 +219,108 @@ group: Clay pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Blue Stained Clay recipe: input: Hardened Clay, Lapis Lazuli pattern: 000 010 000 tools: Crafting Table - + item: Brown Stained Clay recipe: input: Cocoa Beans, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + item: Clay (block) recipe: input: Clay pattern: 00. 00. ... - + item: Cyan Stained Clay recipe: input: Cyan Dye, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + item: Gray Stained Clay recipe: input: Gray Dye, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + item: Green Stained Clay recipe: input: Cactus Green, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + item: Hardened Clay recipe: input: Clay (block), furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Light Blue Stained Clay recipe: input: Hardened Clay, Light Blue Dye pattern: 000 010 000 tools: Crafting Table - + item: Light Gray Stained Clay recipe: input: Hardened Clay, Light Gray Dye pattern: 000 010 000 tools: Crafting Table - + item: Lime Stained Clay recipe: input: Hardened Clay, Lime Dye pattern: 000 010 000 tools: Crafting Table - + item: Magenta Stained Clay recipe: input: Hardened Clay, Magenta Dye pattern: 000 010 000 tools: Crafting Table - + item: Orange Stained Clay recipe: input: Hardened Clay, Orange Dye pattern: 000 010 000 tools: Crafting Table - + item: Pink Stained Clay recipe: input: Hardened Clay, Pink Dye pattern: 000 010 000 tools: Crafting Table - + item: Purple Stained Clay recipe: input: Hardened Clay, Purple Dye pattern: 000 010 000 tools: Crafting Table - + item: Red Stained Clay recipe: input: Hardened Clay, Rose Red pattern: 000 010 000 tools: Crafting Table - + item: White Stained Clay recipe: input: Bone Meal, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + item: Yellow Stained Clay recipe: input: Dandelion Yellow, Hardened Clay pattern: 111 101 111 tools: Crafting Table - + group: Decoration item: Fence @@ -309,43 +329,43 @@ group: Decoration pattern: ... 000 000 quantity: 2 tools: Crafting Table - + item: Fence Gate recipe: input: Oak Wood Planks, Stick pattern: ... 010 010 tools: Crafting Table - + item: Flower Pot recipe: input: Brick pattern: ... 0.0 .0. tools: Crafting Table - + item: Iron Bars recipe: input: Iron Ingot pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Item Frame recipe: input: Leather, Stick pattern: 111 101 111 tools: Crafting Table - + item: Jack o'Lantern recipe: input: Pumpkin, Torch pattern: ... .0. .1. - + item: Painting recipe: input: Stick, Wool pattern: 000 010 000 tools: Crafting Table - + group: Dyes item: Cactus Green @@ -353,13 +373,13 @@ group: Dyes input: Cactus, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Cyan Dye recipe: input: Cactus Green, Lapis Lazuli pattern: ... 01. ... quantity: 2 - + item: Dandelion Yellow recipe: input: Sunflower @@ -368,13 +388,13 @@ group: Dyes recipe: input: Dandelion pattern: ... .0. ... - + item: Gray Dye recipe: input: Bone Meal, Ink Sac pattern: ... .0. .1. quantity: 2 - + item: Light Blue Dye recipe: input: Blue Orchid @@ -383,7 +403,7 @@ group: Dyes input: Bone Meal, Lapis Lazuli pattern: ... .0. .1. quantity: 2 - + item: Light Gray Dye recipe: input: White Tulip @@ -402,13 +422,13 @@ group: Dyes input: Bone Meal, Gray Dye pattern: ... .0. .1. quantity: 2 - + item: Lime Dye recipe: input: Bone Meal, Cactus Green pattern: ... .0. .1. quantity: 2 - + item: Magenta Dye recipe: input: Lilac @@ -429,7 +449,7 @@ group: Dyes recipe: input: Allium pattern: ... .0. ... - + item: Orange Dye recipe: input: Orange Tulip @@ -438,7 +458,7 @@ group: Dyes input: Dandelion Yellow, Rose Red pattern: ... .0. .1. quantity: 2 - + item: Pink Dye recipe: input: Peony @@ -451,13 +471,13 @@ group: Dyes input: Bone Meal, Rose Red pattern: ... .0. .1. quantity: 2 - + item: Purple Dye recipe: input: Lapis Lazuli, Rose Red pattern: ... .0. .1. quantity: 2 - + item: Rose Red recipe: input: Rose Bush @@ -476,7 +496,7 @@ group: Dyes recipe: input: Poppy pattern: ... .0. ... - + group: Enchanting item: Anvil @@ -484,36 +504,40 @@ group: Enchanting input: Block of Iron, Iron Ingot pattern: 000 .1. 111 tools: Crafting Table - + item: Book recipe: input: Leather, Paper pattern: 01. 11. ... - + item: Book and Quill recipe: input: Book, Feather, Ink Sac pattern: .1. 02. ... - + item: Bookshelf recipe: input: Book, Oak Wood Planks pattern: 111 000 111 tools: Crafting Table - + + item: Bottle o' Enchanting + + item: Enchanted Book + item: Enchantment Table recipe: input: Book, Diamond, Obsidian pattern: .0. 121 222 tools: Crafting Table - + item: Paper recipe: input: Sugar Canes pattern: ... 000 ... quantity: 3 tools: Crafting Table - + group: Functional Blocks item: Beacon @@ -521,66 +545,76 @@ group: Functional Blocks input: Glass, Nether Star, Obsidian pattern: 000 010 222 tools: Crafting Table - + item: Bed recipe: input: Oak Wood Planks, Wool pattern: ... 111 000 tools: Crafting Table - + item: Chest recipe: input: Oak Wood Planks pattern: 000 0.0 000 tools: Crafting Table - + + item: Command Block + item: Crafting Table recipe: input: Oak Wood Planks pattern: 00. 00. ... - + item: Ender Chest recipe: input: Eye of Ender, Obsidian pattern: 111 101 111 tools: Crafting Table - + item: Furnace recipe: input: Cobblestone pattern: 000 0.0 000 tools: Crafting Table - + item: Iron Door recipe: input: Iron Ingot pattern: .00 .00 .00 tools: Crafting Table - + item: Jukebox recipe: input: Diamond, Oak Wood Planks pattern: 111 101 111 tools: Crafting Table - + + item: Ladder + recipe: + input: Stick + pattern: 0.0 000 0.0 + tools: Crafting Table + + item: Monster Spawner + item: Note Block recipe: input: Oak Wood Planks, Redstone pattern: 000 010 000 tools: Crafting Table - + item: Sign recipe: input: Oak Wood Planks, Stick pattern: 000 000 .1. tools: Crafting Table - + item: TNT recipe: input: Gunpowder, Sand pattern: 010 101 010 tools: Crafting Table - + item: Torch recipe: input: Charcoal, Stick @@ -590,25 +624,25 @@ group: Functional Blocks input: Coal, Stick pattern: ... .0. .1. quantity: 4 - + item: Trapdoor recipe: input: Oak Wood Planks pattern: ... 000 000 quantity: 2 tools: Crafting Table - + item: Trapped Chest recipe: input: Chest, Tripwire Hook pattern: ... .1. .0. - + item: Wooden Door recipe: input: Oak Wood Planks pattern: .00 .00 .00 tools: Crafting Table - + group: Glass item: Black Stained Glass @@ -617,371 +651,397 @@ group: Glass pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Black Stained Glass Pane recipe: input: Black Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Blue Stained Glass recipe: input: Glass, Lapis Lazuli pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Blue Stained Glass Pane recipe: input: Blue Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Brown Stained Glass recipe: input: Cocoa Beans, Glass pattern: 111 101 111 quantity: 8 tools: Crafting Table - + item: Brown Stained Glass Pane recipe: input: Brown Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Cyan Stained Glass recipe: input: Cyan Dye, Glass pattern: 111 101 111 quantity: 8 tools: Crafting Table - + item: Cyan Stained Glass Pane recipe: input: Cyan Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Glass recipe: input: Sand, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Glass Pane recipe: input: Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Gray Stained Glass recipe: input: Glass, Gray Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Gray Stained Glass Pane recipe: input: Gray Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Green Stained Glass recipe: input: Cactus Green, Glass pattern: 111 101 111 quantity: 8 tools: Crafting Table - + item: Green Stained Glass Pane recipe: input: Green Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Light Blue Stained Glass recipe: input: Glass, Light Blue Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Light Blue Stained Glass Pane recipe: input: Light Blue Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Light Gray Stained Glass recipe: input: Glass, Light Gray Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Light Gray Stained Glass Pane recipe: input: Light Gray Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Lime Stained Glass recipe: input: Glass, Lime Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Lime Stained Glass Pane recipe: input: Lime Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Magenta Stained Glass recipe: input: Glass, Magenta Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Magenta Stained Glass Pane recipe: input: Magenta Stained Glass pattern: ... 000 ... quantity: 16 tools: Crafting Table - + item: Orange Stained Glass recipe: input: Glass, Orange Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Orange Stained Glass Pane recipe: input: Orange Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Pink Stained Glass recipe: input: Glass, Pink Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Pink Stained Glass Pane recipe: input: Pink Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Purple Stained Glass recipe: input: Glass, Purple Dye pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Purple Stained Glass Pane recipe: input: Purple Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Red Stained Glass recipe: input: Glass, Rose Red pattern: 000 010 000 quantity: 8 tools: Crafting Table - + item: Red Stained Glass Pane recipe: input: Red Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: White Stained Glass recipe: input: Bone Meal, Glass pattern: 111 101 111 quantity: 8 tools: Crafting Table - + item: White Stained Glass Pane recipe: input: White Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + item: Yellow Stained Glass recipe: input: Dandelion Yellow, Glass pattern: 111 101 111 quantity: 8 tools: Crafting Table - + item: Yellow Stained Glass Pane recipe: input: Yellow Stained Glass pattern: ... 000 000 quantity: 16 tools: Crafting Table - + group: Husbandry + item: Clownfish + item: Cooked Chicken recipe: input: Raw Chicken, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Cooked Fish recipe: input: Raw Fish, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Cooked Porkchop recipe: input: Raw Porkchop, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Cooked Salmon recipe: input: Raw Salmon, furnace fuel pattern: .0. ... .1. tools: Furnace - + + item: Egg + + item: Feather + item: Hay Bale recipe: input: Wheat pattern: 000 000 000 tools: Crafting Table - + item: Lead recipe: input: Slimeball, String pattern: 11. 10. ..1 quantity: 2 tools: Crafting Table - + + item: Leather + item: Milk recipe: input: Bucket pattern: ... .0. ... tools: Cow - + + item: Raw Beef + + item: Raw Chicken + + item: Raw Fish + + item: Raw Porkchop + + item: Raw Salmon + item: Steak recipe: input: Raw Beef, furnace fuel pattern: .0. ... .1. tools: Furnace - + group: Husbandry: Wool item: Black Wool recipe: input: Ink Sac, Wool pattern: ... .1. .0. - + item: Blue Wool recipe: input: Lapis Lazuli, Wool pattern: ... .1. .0. - + item: Brown Wool recipe: input: Cocoa Beans, Wool pattern: ... .1. .0. - + item: Cyan Wool recipe: input: Cyan Dye, Wool pattern: ... .1. .0. - + item: Gray Wool recipe: input: Gray Dye, Wool pattern: ... .1. .0. - + item: Green Wool recipe: input: Cactus Green, Wool pattern: ... .1. .0. - + item: Light Blue Wool recipe: input: Light Blue Dye, Wool pattern: ... .1. .0. - + item: Light Gray Wool recipe: input: Light Gray Dye, Wool pattern: ... .1. .0. - + item: Lime Wool recipe: input: Lime Dye, Wool pattern: ... .1. .0. - + item: Magenta Wool recipe: input: Magenta Dye, Wool pattern: ... .1. .0. - + item: Orange Wool recipe: input: Orange Dye, Wool pattern: ... .1. .0. - + item: Pink Wool recipe: input: Pink Dye, Wool pattern: ... .1. .0. - + item: Purple Wool recipe: input: Purple Dye, Wool pattern: ... .1. .0. - + item: Red Wool recipe: input: Rose Red, Wool pattern: ... .1. .0. - + item: Wool gatherable: yes recipe: input: String pattern: 00. 00. ... - + item: Yellow Wool recipe: input: Dandelion Yellow, Wool pattern: ... .0. .1. - + +group: Liquids + + item: Lava + + item: Water + + item: Fire + group: Minerals item: Block of Coal @@ -989,39 +1049,39 @@ group: Minerals input: Coal pattern: 000 000 000 tools: Crafting Table - + item: Block of Diamond recipe: input: Diamond pattern: 000 000 000 - + item: Block of Emerald recipe: input: Emerald pattern: 000 000 000 tools: Crafting Table - + item: Block of Gold recipe: input: Gold Ingot pattern: 000 000 000 - + item: Block of Iron recipe: input: Iron Ingot pattern: 000 000 000 - + item: Block of Quartz recipe: input: Nether Quartz pattern: 00. 00. ... - + item: Block of Redstone recipe: input: Redstone pattern: 000 000 000 tools: Crafting Table - + item: Charcoal recipe: input: Oak Wood, furnace fuel @@ -1031,21 +1091,25 @@ group: Minerals input: Oak Wood, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Coal gatherable: yes recipe: input: Block of Coal pattern: ... .0. ... quantity: 9 - + + item: Coal Ore + item: Diamond gatherable: yes recipe: input: Block of Diamond pattern: ... .0. ... quantity: 9 - + + item: Diamond Ore + item: Emerald gatherable: yes recipe: @@ -1056,12 +1120,16 @@ group: Minerals input: Emerald Ore, furnace fuel pattern: .0. ... .1. tools: Furnace - + + item: Emerald Ore + item: Glowstone recipe: input: Glowstone Dust pattern: 00. 00. ... - + + item: Glowstone Dust + item: Gold Ingot recipe: input: Gold Ore, furnace fuel @@ -1075,16 +1143,18 @@ group: Minerals input: Gold Nugget pattern: 000 000 000 tools: Crafting Table - + item: Gold Nugget recipe: input: Gold Ingot pattern: ... .0. ... quantity: 9 - + + item: Gold Ore + item: Ice gatherable: yes - + item: Iron Ingot recipe: input: Iron Ore, furnace fuel @@ -1094,27 +1164,35 @@ group: Minerals input: Block of Iron pattern: ... .0. ... quantity: 9 - + + item: Iron Ore + item: Lapis Lazuli gatherable: yes recipe: input: Lapis Lazuli Ore, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Lapis Lazuli Block recipe: input: Lapis Lazuli pattern: 000 000 000 tools: Crafting Table - + + item: Lapis Lazuli Ore + item: Nether Quartz gatherable: yes recipe: input: Nether Quartz Ore, furnace fuel pattern: .0. ... .1. tools: Furnace - + + item: Nether Quartz Ore + + item: Packed Ice + item: Redstone gatherable: yes recipe: @@ -1125,33 +1203,114 @@ group: Minerals input: Block of Redstone pattern: ... .0. ... quantity: 9 - + + item: Redstone Ore + item: Sandstone recipe: input: Sand pattern: 00. 00. ... - + item: Snow (block) recipe: input: Snowball pattern: 00. 00. ... - + item: Snow (carpet) recipe: input: Snow (block) pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Snowball gatherable: yes - - item: Stone - recipe: - input: Cobblestone, furnace fuel - pattern: .0. ... .1. - tools: Furnace - + +group: Mob Drops + + item: Blaze Rod + + item: Bone + + item: Cobweb + + item: Creeper Head + + item: Dragon Egg + + item: Ender Pearl + + item: Ghast Tear + + item: Gunpowder + + item: Head + + item: Ink Sac + + item: Nether Star + + item: Rotten Flesh + + item: Skeleton Skull + + item: Slimeball + + item: Spider Eye + + item: String + gatherable: yes + + item: Wither Skeleton Skull + + item: Zombie Head + +group: Plants + + item: Allium + + item: Azure Bluet + + item: Blue Orchid + + item: Dandelion + + item: Dead Bush + + item: Double Tallgrass + + item: Fern + + item: Grass + + item: Large Fern + + item: Lilac + + item: Lily Pad + + item: Orange Tulip + + item: Oxeye Daisy + + item: Peony + + item: Pink Tulip + + item: Poppy + + item: Red Tulip + + item: Rose Bush + + item: Sponge + + item: Sunflower + + item: Vines + + item: White Tulip + group: Potions: Brewing item: Awkward Potion @@ -1160,74 +1319,76 @@ group: Potions: Brewing pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Blaze Powder recipe: input: Blaze Rod pattern: ... .0. ... quantity: 2 - + item: Brewing Stand recipe: input: Blaze Rod, Cobblestone pattern: ... .0. 111 tools: Crafting Table - + item: Cauldron recipe: input: Iron Ingot pattern: 0.0 0.0 000 tools: Crafting Table - + item: Fermented Spider Eye recipe: input: Mushroom (brown), Spider Eye, Sugar pattern: .2. .0. .1. - + item: Glass Bottle recipe: input: Glass pattern: ... 0.0 .0. quantity: 3 tools: Crafting Table - + item: Glistering Melon recipe: input: Gold Nugget, Melon pattern: 000 010 000 tools: Crafting Table - + item: Golden Carrot recipe: input: Carrot, Gold Nugget pattern: 111 101 111 tools: Crafting Table - + item: Magma Cream recipe: input: Blaze Powder, Slimeball pattern: ... .0. .1. - + item: Mundane Potion recipe: input: Redstone, Water Bottle pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Mundane Splash Potion recipe: input: Gunpowder, Mundane Potion pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + + item: Pufferfish + item: Water Bottle recipe: input: Glass Bottle pattern: ... .0. ... tools: Water - + group: Potions: Normal item: Potion of Fire Resistance (3:00) @@ -1236,14 +1397,14 @@ group: Potions: Normal pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Fire Resistance (8:00) recipe: input: Potion of Fire Resistance (3:00), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Harming recipe: input: Fermented Spider Eye, Potion of Poison (0:45) @@ -1270,7 +1431,7 @@ group: Potions: Normal pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Harming II recipe: input: Glowstone Dust, Potion of Harming @@ -1287,28 +1448,28 @@ group: Potions: Normal pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Healing recipe: input: Awkward Potion, Glistering Melon pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Healing II recipe: input: Glowstone Dust, Potion of Healing pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Invisibility (3:00) recipe: input: Fermented Spider Eye, Potion of Night Vision (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Invisibility (8:00) recipe: input: Potion of Invisibility (3:00), Redstone @@ -1320,63 +1481,63 @@ group: Potions: Normal pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Night Vision (3:00) recipe: input: Awkward Potion, Golden Carrot pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Night Vision (8:00) recipe: input: Potion of Night Vision (3:00), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Poison (0:45) recipe: input: Awkward Potion, Spider Eye pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Poison II (0:22) recipe: input: Glowstone Dust, Potion of Poison (0:45) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Regeneration (0:45) recipe: input: Awkward Potion, Ghast Tear pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Regeneration (2:00) recipe: input: Potion of Regeneration (0:45), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Regeneration II (0:22) recipe: input: Glowstone Dust, Potion of Regeneration (0:45) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Slowness (1:30) recipe: input: Fermented Spider Eye, Potion of Swiftness (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Slowness (4:00) recipe: input: Potion of Slowness (1:30), Redstone @@ -1393,70 +1554,70 @@ group: Potions: Normal pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Strength (3:00) recipe: input: Awkward Potion, Blaze Powder pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Strength (8:00) recipe: input: Potion of Strength (3:00), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Strength II (1:30) recipe: input: Glowstone Dust, Potion of Strength (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Swiftness (3:00) recipe: input: Awkward Potion, Sugar pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Swiftness (8:00) recipe: input: Potion of Swiftness (3:00), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Swiftness II (1:30) recipe: input: Glowstone Dust, Potion of Swiftness (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Water Breathing (3:00) recipe: input: Awkward Potion, Pufferfish pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Water Breathing (8:00) recipe: input: Potion of Water Breathing (3:00), Redstone pattern: .1. ... 000 quantity: 3 tools: Brewing Stand - + item: Potion of Weakness (1:30) recipe: input: Fermented Spider Eye, Water Bottle pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Potion of Weakness (4:00) recipe: input: Potion of Weakness (1:30), Redstone @@ -1478,14 +1639,14 @@ group: Potions: Normal pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Thick Potion recipe: input: Glowstone Dust, Water Bottle pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + group: Potions: Splash item: Splash Potion of Fire Resistance (2:15) @@ -1494,459 +1655,555 @@ group: Potions: Splash pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Fire Resistance (6:00) recipe: input: Gunpowder, Potion of Fire Resistance (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Harming recipe: input: Gunpowder, Potion of Harming pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Harming II recipe: input: Gunpowder, Potion of Harming II pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Healing recipe: input: Gunpowder, Potion of Healing pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Healing II recipe: input: Gunpowder, Potion of Healing II pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Invisibility (2:15) recipe: input: Gunpowder, Potion of Invisibility (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Invisibility (6:00) recipe: input: Gunpowder, Potion of Invisibility (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Night Vision (2:15) recipe: input: Gunpowder, Potion of Night Vision (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Night Vision (6:00) recipe: input: Gunpowder, Potion of Night Vision (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Poison (0:33) recipe: input: Gunpowder, Potion of Poison (0:45) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Poison (1:30) recipe: input: Gunpowder, Potion of Poison (2:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Poison II (0:16) recipe: input: Gunpowder, Potion of Poison II (0:22) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Regeneration (0:33) recipe: input: Gunpowder, Potion of Regeneration (0:45) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Regeneration (1:30) recipe: input: Gunpowder, Potion of Regeneration (2:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Regeneration II (0:16) recipe: input: Gunpowder, Potion of Regeneration II (0:22) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Slowness (1:07) recipe: input: Gunpowder, Potion of Slowness (1:30) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Slowness (3:00) recipe: input: Gunpowder, Potion of Slowness (4:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Strength (2:15) recipe: input: Gunpowder, Potion of Strength (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Strength (6:00) recipe: input: Gunpowder, Potion of Strength (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Strength II (1:07) recipe: input: Gunpowder, Potion of Strength II (1:30) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Swiftness (2:15) recipe: input: Gunpowder, Potion of Swiftness (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Swiftness (6:00) recipe: input: Gunpowder, Potion of Swiftness (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Swiftness II (1:07) recipe: input: Gunpowder, Potion of Swiftness II (1:30) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Water Breathing (2:15) recipe: input: Gunpowder, Potion of Water Breathing (3:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Water Breathing (6:00) recipe: input: Gunpowder, Potion of Water Breathing (8:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Weakness (1:07) recipe: input: Gunpowder, Potion of Weakness (1:30) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + item: Splash Potion of Weakness (3:00) recipe: input: Gunpowder, Potion of Weakness (4:00) pattern: .0. ... 111 quantity: 3 tools: Brewing Stand - + group: Redstone Machines item: Button (stone) recipe: input: Stone pattern: ... .0. ... - + item: Button (wood) recipe: input: Oak Wood Planks pattern: ... .0. ... - + item: Daylight Sensor recipe: input: Glass, Nether Quartz, Oak Wood Slab pattern: 000 111 222 tools: Crafting Table - + item: Dispenser recipe: input: Bow, Cobblestone, Redstone pattern: 111 101 121 tools: Crafting Table - + item: Dropper recipe: input: Cobblestone, Redstone pattern: 000 0.0 010 tools: Crafting Table - + item: Hopper recipe: input: Chest, Iron Ingot pattern: 1.1 101 .1. tools: Crafting Table - + item: Lever recipe: input: Cobblestone, Stick pattern: ... .1. .0. - + item: Piston recipe: input: Cobblestone, Iron Ingot, Oak Wood Planks, Redstone pattern: 222 010 030 tools: Crafting Table - + item: Pressure Plate (stone) recipe: input: Stone pattern: ... 00. ... - + item: Pressure Plate (wood) recipe: input: Oak Wood Planks pattern: ... 00. ... - + item: Redstone Comparator recipe: input: Nether Quartz, Redstone Torch, Stone pattern: .1. 101 222 tools: Crafting Table - + item: Redstone Lamp recipe: input: Glowstone, Redstone pattern: .1. 101 .1. tools: Crafting Table - + item: Redstone Repeater recipe: input: Redstone, Redstone Torch, Stone pattern: ... 101 222 tools: Crafting Table - + item: Redstone Torch recipe: input: Redstone, Stick pattern: ... .0. .1. - + item: Sticky Piston recipe: input: Piston, Slimeball pattern: ... .1. .0. - + item: Tripwire Hook recipe: input: Iron Ingot, Oak Wood Planks, Stick pattern: .0. .2. .1. quantity: 2 tools: Crafting Table - + item: Weighted Pressure Plate (heavy) recipe: input: Iron Ingot pattern: ... 00. ... - + item: Weighted Pressure Plate (light) recipe: input: Gold Ingot pattern: ... 00. ... - -group: Stone + +group: Spawn Eggs + + item: Spawn Bat + + item: Spawn Blaze + + item: Spawn Cave Spider + + item: Spawn Chicken + + item: Spawn Cow + + item: Spawn Creeper + + item: Spawn Enderman + + item: Spawn Ghast + + item: Spawn Horse + + item: Spawn Iron Golem + + item: Spawn Magma Cube + + item: Spawn Mooshroom + + item: Spawn Ocelot + + item: Spawn Pig + + item: Spawn Sheep + + item: Spawn Silverfish + + item: Spawn Skeleton + + item: Spawn Slime + + item: Spawn Snow Golem + + item: Spawn Spider + + item: Spawn Squid + + item: Spawn Villager + + item: Spawn Witch + + item: Spawn Wolf + + item: Spawn Zombie + + item: Spawn Zombie Pigman + +group: Earth Materials + + item: Bedrock item: Brick recipe: input: Clay, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Brick Stairs recipe: input: Bricks pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + item: Bricks recipe: input: Brick pattern: 00. 00. ... - + item: Bricks Slab recipe: input: Bricks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Chiseled Quartz Block recipe: input: Quartz Slab pattern: ... .0. .0. - + item: Chiseled Sandstone recipe: input: Sandstone Slab pattern: ... .0. .0. - + + item: Chiseled Stone Bricks + + item: Cobblestone + item: Cobblestone Slab recipe: input: Cobblestone pattern: ... 000 ... quantity: 6 - + item: Cobblestone Wall recipe: input: Cobblestone pattern: ... 000 000 quantity: 6 tools: Crafting Table - + + item: Cracked Stone Bricks + + item: Dirt + + item: End Stone + + item: Flint + + item: Grass Block + + item: Gravel + + item: Moss Stone + item: Mossy Cobblestone Wall recipe: input: Moss Stone pattern: ... 000 000 quantity: 6 tools: Crafting Table - + + item: Mossy Stone Bricks + + item: Mycelium + item: Nether Brick recipe: input: Netherrack, furnace fuel pattern: .0. ... .1. tools: Furnace - + item: Nether Brick (block) recipe: input: Nether Brick pattern: 00. 00. ... - + item: Nether Brick Fence recipe: input: Nether Brick pattern: ... 000 000 quantity: 6 tools: Crafting Table - + item: Nether Brick Slab recipe: input: Nether Brick (block) pattern: ... 000 ... quantity: 6 - + item: Nether Brick Stairs recipe: input: Nether Brick (block) pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Netherrack + + item: Obsidian + item: Pillar Quartz Block recipe: input: Block of Quartz pattern: ... .0. .0. quantity: 2 - + + item: Podzol + item: Quartz Slab recipe: input: Block of Quartz pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Quartz Stairs recipe: input: Block of Quartz pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Red Sand + + item: Sand + item: Sandstone Slab recipe: input: Sandstone pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Sandstone Stairs recipe: input: Sandstone pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + item: Smooth Sandstone recipe: input: Sandstone pattern: 00. 00. ... quantity: 4 - + + item: Soul Sand + + item: Stone + recipe: + input: Cobblestone, furnace fuel + pattern: .0. ... .1. + tools: Furnace + item: Stone Brick Stairs recipe: input: Stone Bricks pattern: 0.. 00. 000 quantity: 4 - + item: Stone Bricks recipe: input: Stone pattern: 00. 00. ... quantity: 4 - + item: Stone Bricks Slab recipe: input: Stone Bricks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Stone Slab recipe: input: Stone pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Stone Stairs recipe: input: Cobblestone pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + group: Tools item: Bucket @@ -1954,37 +2211,37 @@ group: Tools input: Iron Ingot pattern: ... 0.0 .0. tools: Crafting Table - + item: Clock recipe: input: Gold Ingot, Redstone pattern: .0. 010 .0. tools: Crafting Table - + item: Compass recipe: input: Iron Ingot, Redstone pattern: .0. 010 .0. tools: Crafting Table - + item: Diamond Axe recipe: input: Diamond, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Diamond Pickaxe recipe: input: Diamond, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Diamond Shovel recipe: input: Diamond, Stick pattern: .0. .1. .1. tools: Crafting Table - + item: Empty Map recipe: input: Compass, Paper @@ -1994,12 +2251,12 @@ group: Tools input: Map (completed), Paper pattern: 111 101 111 tools: Crafting Table - + item: Eye of Ender recipe: input: Blaze Powder, Ender Pearl pattern: ... .0. .1. - + item: Fire Charge recipe: input: Blaze Powder, Coal, Gunpowder @@ -2009,153 +2266,160 @@ group: Tools input: Blaze Powder, Charcoal, Gunpowder pattern: .2. .0. .1. quantity: 3 - + item: Firework Rocket (duration 1) recipe: input: Gunpowder, Paper pattern: ... .1. .0. - + item: Firework Rocket (duration 2) recipe: input: Gunpowder, Paper pattern: ... .1. 0.0 - + item: Firework Rocket (duration 3) recipe: input: Gunpowder, Paper pattern: ... .1. 000 - + + item: Firework Star + item: Fishing Rod recipe: input: Stick, String pattern: ..0 .01 0.1 tools: Crafting Table - + item: Flint and Steel recipe: input: Flint, Iron Ingot pattern: ... .1. ..0 - + item: Golden Axe recipe: input: Gold Ingot, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Golden Hoe recipe: input: Gold Ingot, Stick pattern: 00. .1. .1. tools: Crafting Table - + item: Golden Pickaxe recipe: input: Gold Ingot, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Golden Shovel recipe: input: Gold Ingot, Stick pattern: .0. .1. .1. tools: Crafting Table - + item: Iron Axe recipe: input: Iron Ingot, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Iron Hoe recipe: input: Iron Ingot, Stick pattern: 00. .1. .1. tools: Crafting Table - + item: Iron Pickaxe recipe: input: Iron Ingot, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Iron Shovel recipe: input: Iron Ingot, Stick pattern: .0. .1. .1. tools: Crafting Table - + item: Lava Bucket recipe: input: Bucket, Lava pattern: ... .1. .0. - + + item: Music Disc + + item: Name Tag + + item: Saddle + item: Shears recipe: input: Iron Ingot pattern: ... .0. ..0 - + item: Stick recipe: input: Oak Wood Planks pattern: ... .0. .0. quantity: 4 - + item: Stone Axe recipe: input: Cobblestone, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Stone Hoe recipe: input: Cobblestone, Stick pattern: 00. .1. .1. tools: Crafting Table - + item: Stone Pickaxe recipe: input: Cobblestone, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Stone Shovel recipe: input: Cobblestone, Stick pattern: .0. .1. .1. tools: Crafting Table - - item: String - gatherable: yes - + item: Water Bucket recipe: input: Bucket, Water pattern: ... .1. .0. - + item: Wooden Axe recipe: input: Oak Wood Planks, Stick pattern: 00. 01. .1. tools: Crafting Table - + item: Wooden Hoe recipe: input: Oak Wood Planks, Stick pattern: 00. .1. .1. tools: Crafting Table - + item: Wooden Pickaxe recipe: input: Oak Wood Planks, Stick pattern: 000 .1. .1. tools: Crafting Table - + item: Wooden Shovel recipe: input: Oak Wood Planks, Stick pattern: .0. .1. .1. tools: Crafting Table - + + item: Written Book + group: Tools: Armor item: Chain Boots @@ -2163,123 +2427,129 @@ group: Tools: Armor input: Fire pattern: ... 0.0 0.0 tools: Crafting Table - + item: Chain Chestplate recipe: input: Fire pattern: 0.0 000 000 tools: Crafting Table - + item: Chain Helmet recipe: input: Fire pattern: 000 0.0 ... tools: Crafting Table - + item: Chain Leggings recipe: input: Fire pattern: 000 0.0 0.0 tools: Crafting Table - + item: Diamond Boots recipe: input: Diamond pattern: ... 0.0 0.0 tools: Crafting Table - + item: Diamond Chestplate recipe: input: Diamond pattern: 0.0 000 000 tools: Crafting Table - + item: Diamond Helmet recipe: input: Diamond pattern: 000 0.0 ... tools: Crafting Table - + item: Diamond Hoe recipe: input: Diamond, Stick pattern: 00. .1. .1. tools: Crafting Table - + + item: Diamond Horse Armor + item: Diamond Leggings recipe: input: Diamond pattern: 000 0.0 0.0 tools: Crafting Table - + + item: Gold Horse Armor + item: Golden Boots recipe: input: Gold Ingot pattern: ... 0.0 0.0 tools: Crafting Table - + item: Golden Chestplate recipe: input: Gold Ingot pattern: 0.0 000 000 tools: Crafting Table - + item: Golden Helmet recipe: input: Gold Ingot pattern: 000 0.0 ... tools: Crafting Table - + item: Golden Leggings recipe: input: Gold Ingot pattern: 000 0.0 0.0 tools: Crafting Table - + item: Iron Boots recipe: input: Iron Ingot pattern: ... 0.0 0.0 tools: Crafting Table - + item: Iron Chestplate recipe: input: Iron Ingot pattern: 0.0 000 000 tools: Crafting Table - + item: Iron Helmet recipe: input: Iron Ingot pattern: 000 0.0 ... tools: Crafting Table - + + item: Iron Horse Armor + item: Iron Leggings recipe: input: Iron Ingot pattern: 000 0.0 0.0 tools: Crafting Table - + item: Leather Boots recipe: input: Leather pattern: ... 0.0 0.0 - + item: Leather Cap recipe: input: Leather pattern: 000 0.0 ... - + item: Leather Pants recipe: input: Leather pattern: 000 0.0 0.0 - + item: Leather Tunic recipe: input: Leather pattern: 0.0 000 000 - + group: Tools: Weapons item: Arrow @@ -2288,43 +2558,43 @@ group: Tools: Weapons pattern: .1. .2. .0. quantity: 4 tools: Crafting Table - + item: Bow recipe: input: Stick, String pattern: .01 0.1 .01 tools: Crafting Table - + item: Diamond Sword recipe: input: Diamond, Stick pattern: .0. .0. .1. tools: Crafting Table - + item: Golden Sword recipe: input: Gold Ingot, Stick pattern: .0. .0. .1. tools: Crafting Table - + item: Iron Sword recipe: input: Iron Ingot, Stick pattern: .0. .0. .1. tools: Crafting Table - + item: Stone Sword recipe: input: Cobblestone, Stick pattern: .0. .0. .1. tools: Crafting Table - + item: Wooden Sword recipe: input: Oak Wood Planks, Stick pattern: .0. .0. .1. tools: Crafting Table - + group: Transportation item: Activator Rail @@ -2333,183 +2603,220 @@ group: Transportation pattern: 020 010 020 quantity: 6 tools: Crafting Table - + item: Boat recipe: input: Oak Wood Planks pattern: ... 0.0 000 tools: Crafting Table - + item: Carrot on a Stick recipe: input: Carrot, Fishing Rod pattern: ... 10. ... - + item: Detector Rail recipe: input: Iron Ingot, Pressure Plate (stone), Redstone pattern: 0.0 010 020 quantity: 6 tools: Crafting Table - + item: Minecart recipe: input: Iron Ingot pattern: ... 0.0 000 tools: Crafting Table - + item: Minecart with Chest recipe: input: Chest, Minecart pattern: ... .0. .1. - + + item: Minecart with Command Block + item: Minecart with Furnace recipe: input: Furnace, Minecart pattern: ... .0. .1. - + item: Minecart with Hopper recipe: input: Hopper, Minecart pattern: ... .0. .1. - + item: Minecart with TNT recipe: input: Minecart, TNT pattern: ... .1. .0. - + item: Powered Rail recipe: input: Gold Ingot, Redstone, Stick pattern: 0.0 020 010 quantity: 6 tools: Crafting Table - + item: Rail recipe: input: Iron Ingot, Stick pattern: 0.0 010 0.0 quantity: 16 tools: Crafting Table - + group: Wood + item: Acacia Leaves + + item: Acacia Sapling + + item: Acacia Wood + item: Acacia Wood Planks recipe: input: Acacia Wood pattern: ... .0. ... quantity: 4 - + item: Acacia Wood Slab recipe: input: Acacia Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Acacia Wood Stairs recipe: input: Acacia Wood Planks pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Birch Leaves + + item: Birch Sapling + + item: Birch Wood + item: Birch Wood Planks recipe: input: Birch Wood pattern: ... .0. ... quantity: 4 - + item: Birch Wood Slab recipe: input: Birch Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Birch Wood Stairs recipe: input: Birch Wood Planks pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Dark Oak Leaves + + item: Dark Oak Sapling + + item: Dark Oak Wood + item: Dark Oak Wood Planks recipe: input: Dark Oak Wood pattern: ... .0. ... quantity: 4 - + item: Dark Oak Wood Slab recipe: input: Dark Oak Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Dark Oak Wood Stairs recipe: input: Dark Oak Wood Planks pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Jungle Leaves + + item: Jungle Sapling + + item: Jungle Wood + item: Jungle Wood Planks recipe: input: Jungle Wood pattern: ... .0. ... quantity: 4 - + item: Jungle Wood Slab recipe: input: Jungle Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Jungle Wood Stairs recipe: input: Jungle Wood Planks pattern: 0.. 00. 000 quantity: 4 tools: Crafting Table - + + item: Oak Leaves + + item: Oak Sapling + + item: Oak Wood + item: Oak Wood Planks recipe: input: Oak Wood pattern: ... .0. ... quantity: 4 - + item: Oak Wood Slab recipe: input: Oak Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Oak Wood Stairs recipe: input: Oak Wood Planks pattern: 0.. 00. 000 quantity: 4 - + + item: Spruce Leaves + + item: Spruce Sapling + + item: Spruce Wood + item: Spruce Wood Planks recipe: input: Spruce Wood pattern: ... .0. ... quantity: 4 - + item: Spruce Wood Slab recipe: input: Spruce Wood Planks pattern: ... 000 ... quantity: 6 tools: Crafting Table - + item: Spruce Wood Stairs recipe: input: Spruce Wood Planks pattern: 0.. 00. 000 quantity: 4 - tools: Crafting Table - + tools: Crafting Table \ No newline at end of file From e4369ba9449f0992de9ef1239ec355c451b718a5 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 17:36:02 -0800 Subject: [PATCH 06/11] Fix crafting algo. to avoid cycles #47 * Adjust recipes in Thermal Expansion to likewise avoid cycles --- .../4.0.0B8-23/mod-version.cg | 64 +++++++++---------- src/scripts/models/crafting_plan.coffee | 12 +++- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/data/thermal_expansion/4.0.0B8-23/mod-version.cg b/src/data/thermal_expansion/4.0.0B8-23/mod-version.cg index 34baac4f6..3f5b7c953 100644 --- a/src/data/thermal_expansion/4.0.0B8-23/mod-version.cg +++ b/src/data/thermal_expansion/4.0.0B8-23/mod-version.cg @@ -278,14 +278,6 @@ item: Copper Gear tools: Crafting Table item: Copper Ingot - recipe: - input: Pulverized Copper, furnace fuel - pattern: .0. ... .1. - tools: Furnace - recipe: - input: Pulverized Copper - pattern: ... .0. ... - tools: Redstone Furnace recipe: input: Copper Ore, furnace fuel pattern: .0. ... .1. @@ -294,6 +286,14 @@ item: Copper Ingot input: Copper Ore pattern: ... .0. ... tools: Redstone Furnace + recipe: + input: Pulverized Copper, furnace fuel + pattern: .0. ... .1. + tools: Furnace + recipe: + input: Pulverized Copper + pattern: ... .0. ... + tools: Redstone Furnace recipe: extras: Gold Ingot input: Cinnabar, Copper Ore @@ -1089,14 +1089,6 @@ item: Lead Gear tools: Crafting Table item: Lead Ingot - recipe: - input: Pulverized Lead, furnace fuel - pattern: .0. ... .1. - tools: Furnace - recipe: - input: Pulverized Lead - pattern: ... .0. ... - tools: Redstone Furnace recipe: input: Lead Ore, furnace fuel pattern: .0. ... .1. @@ -1105,6 +1097,14 @@ item: Lead Ingot input: Lead Ore pattern: ... .0. ... tools: Redstone Furnace + recipe: + input: Pulverized Lead, furnace fuel + pattern: .0. ... .1. + tools: Furnace + recipe: + input: Pulverized Lead + pattern: ... .0. ... + tools: Redstone Furnace recipe: extras: Silver Ingot input: Cinnabar, Lead Ore @@ -2031,14 +2031,6 @@ item: Silver Gear tools: Crafting Table item: Silver Ingot - recipe: - input: Pulverized Silver, furnace fuel - pattern: .0. ... .1. - tools: Furnace - recipe: - input: Pulverized Silver - pattern: ... .0. ... - tools: Redstone Furnace recipe: input: Silver Ore, furnace fuel pattern: .0. ... .1. @@ -2047,6 +2039,14 @@ item: Silver Ingot input: Silver Ore pattern: ... .0. ... tools: Redstone Furnace + recipe: + input: Pulverized Silver, furnace fuel + pattern: .0. ... .1. + tools: Furnace + recipe: + input: Pulverized Silver + pattern: ... .0. ... + tools: Redstone Furnace recipe: extras: Lead Ingot input: Cinnabar, Silver Ore @@ -2149,14 +2149,6 @@ item: Tin Gear tools: Crafting Table item: Tin Ingot - recipe: - input: Pulverized Tin, furnace fuel - pattern: .0. ... .1. - tools: Furnace - recipe: - input: Pulverized Tin - pattern: ... .0. ... - tools: Redstone Furnace recipe: input: Tin Ore, furnace fuel pattern: .0. ... .1. @@ -2165,6 +2157,14 @@ item: Tin Ingot input: Tin Ore pattern: ... .0. ... tools: Redstone Furnace + recipe: + input: Pulverized Tin, furnace fuel + pattern: .0. ... .1. + tools: Furnace + recipe: + input: Pulverized Tin + pattern: ... .0. ... + tools: Redstone Furnace recipe: extras: Iron Ingot input: Cinnabar, Tin Ore diff --git a/src/scripts/models/crafting_plan.coffee b/src/scripts/models/crafting_plan.coffee index 5d5dce99a..e59651dda 100644 --- a/src/scripts/models/crafting_plan.coffee +++ b/src/scripts/models/crafting_plan.coffee @@ -47,9 +47,11 @@ module.exports = class CraftingPlan extends BaseModel @result.addInventory @have @steps = {} + @_reservedSteps = {} @want.each (stack)=> @_findSteps stack.slug @need.add stack.slug, stack.quantity + @_reservedSteps = null @steps = _.values @steps @_resolveNeeds() @@ -89,7 +91,6 @@ module.exports = class CraftingPlan extends BaseModel # Private Methods ############################################################################## _addStep: (recipe)-> - return if @_hasStep recipe.slug logger.verbose "adding step: #{recipe.slug}" @steps[recipe.slug] = recipe:recipe @@ -97,6 +98,7 @@ module.exports = class CraftingPlan extends BaseModel return item.getPrimaryRecipe() _findSteps: (slug)-> + logger.debug "finding steps for #{slug}" item = @modPack.findItem slug return unless item? return unless item.isCraftable @@ -109,13 +111,19 @@ module.exports = class CraftingPlan extends BaseModel if not @_hasStep toolStack.slug @_findSteps toolStack.slug + return if @_hasStep item.slug + logger.debug "reserving: #{item.slug}" + @_reservedSteps[item.slug] = recipe + for inputStack in recipe.input @_findSteps inputStack.slug @_addStep recipe _hasStep: (slug)-> - return @steps[slug]? + return true if @steps[slug]? + return true if @_reservedSteps[slug]? + return false _removeExtraSteps: -> result = (step for step in @steps when step.multiplier > 0) From 3790c26c5c531a6c6a99fdf93c7466fa16726927 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 20:25:54 -0800 Subject: [PATCH 07/11] Add link to crafting plan from item detail #83 --- src/css/templates/item_page.scss | 14 +++++++++++- .../controllers/item_page_controller.coffee | 22 +++++++++++-------- src/scripts/models/mod_pack.coffee | 5 +++-- src/templates/item_page.jade | 3 ++- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/css/templates/item_page.scss b/src/css/templates/item_page.scss index b4b4e967c..dce1d63f2 100644 --- a/src/css/templates/item_page.scss +++ b/src/css/templates/item_page.scss @@ -24,6 +24,18 @@ All rights reserved. @include pixel-image; } } + + a { + position: relative; width: 80%; + margin: 0 10%; + display: none; + + p { + font-family: $font-family-normal; + font-size: $font-size-normal; + text-align: center; + } + } } .mainBody { @@ -74,7 +86,7 @@ All rights reserved. display: none; } - .usedInMaking { + .usedToMake { display: none; } } diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index a897e5178..e6a0759b0 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -40,16 +40,17 @@ module.exports = class ItemPageController extends BaseController onDidRender: -> @_similarItemsController = @addChild ItemGroupController, '.similar .view__item_group', modPack:@_modPack - @_usedInMakingController = @addChild ItemGroupController, '.usedInMaking .view__item_group', modPack:@_modPack + @_usedToMakeController = @addChild ItemGroupController, '.usedToMake .view__item_group', modPack:@_modPack @$byline = @$('.byline') @$bylineLink = @$('.byline a') + @$craftingPlanLink = @$('a.craftingPlan') @$name = @$('h1.name') @$recipeContainer = @$('.recipes .panel') @$recipesSection = @$('.recipes') @$similarContainer = @$('.similar') @$titleImage = @$('.titleImage img') - @$usedInMakingContainer = @$('.usedInMaking') + @$usedToMakeContainer = @$('.usedToMake') super refresh: -> @@ -58,16 +59,19 @@ module.exports = class ItemPageController extends BaseController display = @_modPack.findItemDisplay @model.item?.slug if display? + @$craftingPlanLink.attr href:display.craftingUrl + @$craftingPlanLink.fadeIn duration:Duration.fast @_imageLoader.load display.iconUrl, @$titleImage @$name.html display.itemName else + @$craftingPlanLink.fadeOut duration:Duration.fast @$titleImage.removeAttr 'src' @$name.html '' @_refreshByline() @_refreshRecipes() @_refreshSimilarItems() - @_refreshComponentIn() + @_refreshUsedToMake() super @@ -82,14 +86,14 @@ module.exports = class ItemPageController extends BaseController else @$byline.fadeOut duration:Duration.fast - _refreshComponentIn: -> - @_usedInMakingController.title = 'Used to Make' + _refreshUsedToMake: -> + @_usedToMakeController.title = 'Used to Make' - @_usedInMakingController.model = @model.findComponentInItems() - if @_usedInMakingController.model? - @$usedInMakingContainer.fadeIn duration:Duration.fast + @_usedToMakeController.model = @model.findComponentInItems() + if @_usedToMakeController.model? + @$usedToMakeContainer.fadeIn duration:Duration.fast else - @$usedInMakingContainer.fadeOut duration:Duration.fast + @$usedToMakeContainer.fadeOut duration:Duration.fast _refreshRecipes: -> @_recipeControllers ?= [] diff --git a/src/scripts/models/mod_pack.coffee b/src/scripts/models/mod_pack.coffee index ed2441f84..cc8fc06bb 100644 --- a/src/scripts/models/mod_pack.coffee +++ b/src/scripts/models/mod_pack.coffee @@ -60,8 +60,9 @@ module.exports = class ModPack extends BaseModel result.slug = slug result.itemName = @findName slug, includeDisabled:true - result.iconUrl = Url.itemIcon result - result.itemUrl = Url.item result + result.craftingUrl = Url.crafting inventoryText:slug + result.iconUrl = Url.itemIcon result + result.itemUrl = Url.item result return result findName: (slug)-> diff --git a/src/templates/item_page.jade b/src/templates/item_page.jade index 453b73009..9600d70fe 100644 --- a/src/templates/item_page.jade +++ b/src/templates/item_page.jade @@ -8,6 +8,7 @@ .view__item_page .sidebar .titleImage: img + a.craftingPlan: p Full Crafting Plan .mainBody h1.name @@ -18,6 +19,6 @@ h2 Recipes .panel - .usedInMaking: .view__item_group + .usedToMake: .view__item_group .similar: .view__item_group .plan \ No newline at end of file From fc0c1170830cbc3e83c0da1e8aea99405a9d8cb5 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 20:41:12 -0800 Subject: [PATCH 08/11] Improve logging performance by using functions Improve logging performance by using functions to delay when complex strings are created until after the current logging level has been checked to ensure that log statement is actually going to be printed. There are many places where very complex objects are printed at lower logging levels which this avoids. --- src/scripts/controllers/base_controller.coffee | 6 +++--- src/scripts/crafting_guide_router.coffee | 6 +++--- src/scripts/main.coffee | 4 ++-- src/scripts/models/base_model.coffee | 10 +++++----- src/scripts/models/crafting_plan.coffee | 6 +++--- src/scripts/models/email_client.coffee | 6 +++--- src/scripts/models/mod.coffee | 2 +- src/scripts/models/storage.coffee | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/scripts/controllers/base_controller.coffee b/src/scripts/controllers/base_controller.coffee index d6bbc6feb..af93ceb00 100644 --- a/src/scripts/controllers/base_controller.coffee +++ b/src/scripts/controllers/base_controller.coffee @@ -36,7 +36,7 @@ module.exports = class BaseController extends Backbone.View return child refresh: -> - logger.verbose "#{this} refreshing" + logger.verbose => "#{this} refreshing" routeLinkClick: (event)-> href = $(event.currentTarget).attr 'href' @@ -91,10 +91,10 @@ module.exports = class BaseController extends Backbone.View data = (@model?.toHash? and @model.toHash()) or @model or {} if not @_template? - logger.error "Default render called for #{@constructor.name} without a template" + logger.error => "Default render called for #{@constructor.name} without a template" return this - logger.verbose "#{this} rendering with data: #{data}" + logger.verbose => "#{this} rendering with data: #{data}" @onWillRender() $oldEl = @$el $newEl = Backbone.$(@_template(data)) diff --git a/src/scripts/crafting_guide_router.coffee b/src/scripts/crafting_guide_router.coffee index f6f0cf051..837178958 100644 --- a/src/scripts/crafting_guide_router.coffee +++ b/src/scripts/crafting_guide_router.coffee @@ -96,15 +96,15 @@ module.exports = class CraftingGuideRouter extends Backbone.Router pathname = window.location.pathname if global.env is 'production' and ga? - logger.info "Recording GA page view: #{pathname}" + logger.info -> "Recording GA page view: #{pathname}" ga 'send', 'pageview', pathname else - logger.info "Suppressing GA page view: #{pathname}" + logger.info -> "Suppressing GA page view: #{pathname}" _setPage: (page, controller)-> return if @_controller is controller - logger.info "changing to page controller: #{controller.constructor.name}" + logger.info -> "changing to page controller: #{controller.constructor.name}" showDuration = Duration.normal show = => @_page = page diff --git a/src/scripts/main.coffee b/src/scripts/main.coffee index 7ebbbebbb..a7103ac29 100644 --- a/src/scripts/main.coffee +++ b/src/scripts/main.coffee @@ -24,7 +24,7 @@ global.logger = new Logger switch window.location.hostname when 'localhost' global.env = 'development' - logger.level = Logger.DEBUG + logger.level = Logger.INFO when 'new.crafting-guide.com' global.env = 'staging' logger.level = Logger.VERBOSE @@ -41,5 +41,5 @@ feedbackController.render() global.router.loadDefaultModPack() -logger.info "CraftingGuide is ready" +logger.info -> "CraftingGuide is ready" Backbone.history.start pushState:true diff --git a/src/scripts/models/base_model.coffee b/src/scripts/models/base_model.coffee index f4ab45bb0..777ad783a 100644 --- a/src/scripts/models/base_model.coffee +++ b/src/scripts/models/base_model.coffee @@ -44,13 +44,13 @@ module.exports = class BaseModel extends Backbone.Model @set @parse text @trigger Event.change, this @trigger Event.sync, this - logger.info "#{@constructor.name}.#{@cid} loaded successfully" + logger.info => "#{@constructor.name}.#{@cid} loaded successfully" catch e - logger.error "A parsing error occured: #{e.stack}" + logger.error -> "A parsing error occured: #{e.stack}" @onLoadFailed e.message, 'parsing failed', xhr onLoadFailed: (error, status, xhr)-> - logger.error "#{@constructor.name}.#{@cid} failed to load: status:#{status}, message:#{error}" + logger.error => "#{@constructor.name}.#{@cid} failed to load: status:#{status}, message:#{error}" @trigger Event.error, this, error # Backbone.Model Overrides ##################################################################### @@ -60,7 +60,7 @@ module.exports = class BaseModel extends Backbone.Model return if (@isLoading or @isLoaded) and not options.force url = @url() - logger.info "#{@constructor.name}.#{@cid} reading from url: #{url}" + logger.info => "#{@constructor.name}.#{@cid} reading from url: #{url}" @trigger Event.request, this @loading = w.promise (resolve, reject)=> @@ -82,7 +82,7 @@ module.exports = class BaseModel extends Backbone.Model trigger: (name, model, args...)-> if @logEvents argText = ("#{arg}"[0..50] for arg in args).join ", " - logger.trace "#{@constructor.name}.#{@cid} triggered event #{name} with args: #{argText}" + logger.trace => "#{@constructor.name}.#{@cid} triggered event #{name} with args: #{argText}" super # Object Overrides ############################################################################# diff --git a/src/scripts/models/crafting_plan.coffee b/src/scripts/models/crafting_plan.coffee index e59651dda..4f2bc5f69 100644 --- a/src/scripts/models/crafting_plan.coffee +++ b/src/scripts/models/crafting_plan.coffee @@ -91,14 +91,14 @@ module.exports = class CraftingPlan extends BaseModel # Private Methods ############################################################################## _addStep: (recipe)-> - logger.verbose "adding step: #{recipe.slug}" + logger.verbose -> "adding step: #{recipe.slug}" @steps[recipe.slug] = recipe:recipe _chooseRecipe: (item)-> return item.getPrimaryRecipe() _findSteps: (slug)-> - logger.debug "finding steps for #{slug}" + logger.debug -> "finding steps for #{slug}" item = @modPack.findItem slug return unless item? return unless item.isCraftable @@ -112,7 +112,7 @@ module.exports = class CraftingPlan extends BaseModel @_findSteps toolStack.slug return if @_hasStep item.slug - logger.debug "reserving: #{item.slug}" + logger.debug -> "reserving: #{item.slug}" @_reservedSteps[item.slug] = recipe for inputStack in recipe.input diff --git a/src/scripts/models/email_client.coffee b/src/scripts/models/email_client.coffee index 16545c237..b12678dff 100644 --- a/src/scripts/models/email_client.coffee +++ b/src/scripts/models/email_client.coffee @@ -32,12 +32,12 @@ module.exports = class EmailClient text: options.body to: [ email:options.toAddress, name:options.toName, type:'to' ] - logger.info "sending email: #{util.inspect(body)}" + logger.info -> "sending email: #{util.inspect(body)}" w.promise (resolve, reject)=> onSuccess = (data, status, request)-> - logger.info "sending email result: #{util.inspect(data)}, status:#{status}" + logger.info -> "sending email result: #{util.inspect(data)}, status:#{status}" data = if _.isArray data then data[0] else data if data.status isnt "sent" reject status:data.status, message:data.reject_reason @@ -45,7 +45,7 @@ module.exports = class EmailClient resolve status:data.status onError = (request, status, error)-> - logger.error "sending email failed: #{status}, error:#{error}" + logger.error -> "sending email failed: #{status}, error:#{error}" reject status:status, message:error $.ajax "#{@baseUrl}/messages/send.json", diff --git a/src/scripts/models/mod.coffee b/src/scripts/models/mod.coffee index c0976838e..9e9dc2ad4 100644 --- a/src/scripts/models/mod.coffee +++ b/src/scripts/models/mod.coffee @@ -169,7 +169,7 @@ module.exports = class Mod extends BaseModel @_activeModVersion = modVersion @trigger Event.change + ':activeModVersion', this, @_activeModVersion - logger.verbose "#{@slug} switched to version #{@_activeVersion}" + logger.verbose => "#{@slug} switched to version #{@_activeVersion}" if @_activeModVersion? @listenTo @_activeModVersion, 'all', -> @trigger.apply this, arguments diff --git a/src/scripts/models/storage.coffee b/src/scripts/models/storage.coffee index d28ada82a..e7bf2e8e2 100644 --- a/src/scripts/models/storage.coffee +++ b/src/scripts/models/storage.coffee @@ -19,12 +19,12 @@ module.exports = class Storage load: (key)-> value = @storage.getItem key - logger.verbose "loaded #{value} from #{key}" + logger.verbose -> "loaded #{value} from #{key}" return value store: (key, value)-> @storage.setItem key, value - logger.verbose "stored #{value} into #{key}" + logger.verbose -> "stored #{value} into #{key}" register: (key, model, properties...)-> modelData = @_models[key] From 7b44711a827c22baa40cad2a343b1f4fdae0f75d Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 20:42:39 -0800 Subject: [PATCH 09/11] Add missing recipe for Advanced Alloy in IC2 --- .../industrial_craft_2/experimental-2.2.663/mod-version.cg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg b/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg index 152e650d0..f035b789d 100644 --- a/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg +++ b/src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg @@ -691,6 +691,12 @@ group: Energy: Transmission group: Machine Parts + item: Advanced Alloy + recipe: + input: Mixed Metal Ingot + pattern: ... .0. ... + tools: Compressor + item: Advanced Circuit recipe: input: Electronic Circuit, Glowstone Dust, Lapis Lazuli, Redstone From b36c03272534adffb43e49133480f1499990888e Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 20:48:37 -0800 Subject: [PATCH 10/11] Fix new links to route internally --- src/scripts/controllers/item_page_controller.coffee | 7 +++++++ src/scripts/controllers/stack_controller.coffee | 1 + 2 files changed, 8 insertions(+) diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index e6a0759b0..00bfbabe8 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -75,6 +75,13 @@ module.exports = class ItemPageController extends BaseController super + # Backbone.View Overrides ###################################################################### + + events: -> + return _.extend super, + 'click a.craftingPlan': 'routeLinkClick' + 'click .byline a': 'routeLinkClick' + # Private Methods ############################################################################## _refreshByline: -> diff --git a/src/scripts/controllers/stack_controller.coffee b/src/scripts/controllers/stack_controller.coffee index 541b8974a..5336cfa30 100644 --- a/src/scripts/controllers/stack_controller.coffee +++ b/src/scripts/controllers/stack_controller.coffee @@ -60,3 +60,4 @@ module.exports = class StackController extends BaseController events: -> return _.extend super, 'click button.remove': 'onRemoveClicked' + 'click .name a': 'routeLinkClick' From 025d78ee9c568bdd86909e39952135799e9053c8 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 9 Feb 2015 21:13:40 -0800 Subject: [PATCH 11/11] Fine tune animation timings --- .../crafting_grid_controller.coffee | 2 +- .../crafting_table_controller.coffee | 4 ++-- .../controllers/feedback_controller.coffee | 4 ++-- .../controllers/full_recipe_controller.coffee | 2 +- .../controllers/inventory_controller.coffee | 4 ++-- .../inventory_table_controller.coffee | 4 ++-- .../controllers/item_group_controller.coffee | 11 +++++----- .../controllers/item_page_controller.coffee | 20 +++++++++---------- .../minimal_recipe_controller.coffee | 2 +- .../controllers/mod_page_controller.coffee | 6 +++--- 10 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/scripts/controllers/crafting_grid_controller.coffee b/src/scripts/controllers/crafting_grid_controller.coffee index 16abb286d..a4f535da4 100644 --- a/src/scripts/controllers/crafting_grid_controller.coffee +++ b/src/scripts/controllers/crafting_grid_controller.coffee @@ -49,7 +49,7 @@ module.exports = class CraftingGridController extends BaseController @_imageLoader.load display.iconUrl, slot.img slot.img.attr 'alt', display.itemName - @$el.tooltip show:{delay:Duration.slow, duration:Duration.fast} + @$el.tooltip show:{delay:Duration.snap, duration:Duration.fast} super # Backbone.View Overrides ###################################################################### diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee index 91845a908..844193ca0 100644 --- a/src/scripts/controllers/crafting_table_controller.coffee +++ b/src/scripts/controllers/crafting_table_controller.coffee @@ -78,9 +78,9 @@ module.exports = class CraftingTableController extends BaseController @$multiplier.html '' if not (@model.hasSteps and global.feedbackController?) - @$problemControl.hide duration:Duration.fast + @$problemControl.hide duration:Duration.snap else - @$problemControl.show duration:Duration.normal + @$problemControl.show duration:Duration.snap super diff --git a/src/scripts/controllers/feedback_controller.coffee b/src/scripts/controllers/feedback_controller.coffee index 8eacf5821..2f1a15139 100644 --- a/src/scripts/controllers/feedback_controller.coffee +++ b/src/scripts/controllers/feedback_controller.coffee @@ -49,7 +49,7 @@ module.exports = class FeedbackController extends BaseController @model.send(message) .then => @onToggle() - @$error.slideUp duration:Duration.fast + @$error.slideUp duration:Duration.normal .catch (error)=> @$error.slideDown duration:Duration.normal .finally => @@ -97,7 +97,7 @@ module.exports = class FeedbackController extends BaseController @$sendButton = @$('button[name="send"]') windowHeight = window.innerHeight - @$el.delay(Duration.slow).animate {left:-@$el.outerWidth()}, Duration.slow + @$el.delay(Duration.slow).animate {left:-@$el.outerWidth()}, Duration.normal @onTextChanged() super diff --git a/src/scripts/controllers/full_recipe_controller.coffee b/src/scripts/controllers/full_recipe_controller.coffee index ed6b0b38e..ea2f355d0 100644 --- a/src/scripts/controllers/full_recipe_controller.coffee +++ b/src/scripts/controllers/full_recipe_controller.coffee @@ -49,7 +49,7 @@ module.exports = class FullRecipeController extends BaseController @gridController.model = @model @$tool.html @_findToolNames().join ', ' - @$el.tooltip show:{delay:Duration.fast, duration:Duration.fast} + @$el.tooltip show:{delay:Duration.normal, duration:Duration.normal} @_refreshInputs() @_refreshOutputs() diff --git a/src/scripts/controllers/inventory_controller.coffee b/src/scripts/controllers/inventory_controller.coffee index aa48a8bec..45fe19e4e 100644 --- a/src/scripts/controllers/inventory_controller.coffee +++ b/src/scripts/controllers/inventory_controller.coffee @@ -97,8 +97,8 @@ module.exports = class InventoryController extends BaseController @$quantityField.focus() return - @$quantityField.removeClass 'error', Duration.fast - @$quantityField.removeClass 'error-new', Duration.fast + @$quantityField.removeClass 'error', Duration.normal + @$quantityField.removeClass 'error-new', Duration.normal @_updateButtonState() onQuantityFieldFocused: -> diff --git a/src/scripts/controllers/inventory_table_controller.coffee b/src/scripts/controllers/inventory_table_controller.coffee index 6abddb72e..4e1d7de00 100644 --- a/src/scripts/controllers/inventory_table_controller.coffee +++ b/src/scripts/controllers/inventory_table_controller.coffee @@ -95,8 +95,8 @@ module.exports = class InventoryTableController extends BaseController @$quantityField.focus() return - @$quantityField.removeClass 'error', Duration.fast - @$quantityField.removeClass 'error-new', Duration.fast + @$quantityField.removeClass 'error', Duration.normal + @$quantityField.removeClass 'error-new', Duration.normal @_updateButtonState() onQuantityFieldFocused: -> diff --git a/src/scripts/controllers/item_group_controller.coffee b/src/scripts/controllers/item_group_controller.coffee index 9e25a1d5d..644a9a14e 100644 --- a/src/scripts/controllers/item_group_controller.coffee +++ b/src/scripts/controllers/item_group_controller.coffee @@ -21,6 +21,7 @@ module.exports = class ItemGroupController extends BaseController options.templateName = 'item_group' super options + @_delayStep = 20 @_itemControllers = [] @_modPack = options.modPack @_title = options.title @@ -53,12 +54,12 @@ module.exports = class ItemGroupController extends BaseController _createItemController: (item)-> controller = new ItemController model:item, modPack:@_modPack - controller.$el.hide() - controller.render() - @_itemControllers.push controller + + controller.render() + controller.$el.hide() @$items.append controller.$el - controller.$el.slideDown duration:Duration.fast + controller.$el.fadeIn duration:Duration.fast _refreshItems: -> controllerIndex = 0 @@ -77,4 +78,4 @@ module.exports = class ItemGroupController extends BaseController while @_itemControllers.length > controllerIndex controller = @_itemControllers.pop() - controller.$el.slideUp duration:Duration.fast, complete:-> @remove() + controller.$el.fadeOut duration:Duration.normal, complete:-> @remove() diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index 00bfbabe8..b672376e4 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -60,11 +60,11 @@ module.exports = class ItemPageController extends BaseController display = @_modPack.findItemDisplay @model.item?.slug if display? @$craftingPlanLink.attr href:display.craftingUrl - @$craftingPlanLink.fadeIn duration:Duration.fast + @$craftingPlanLink.fadeIn duration:Duration.normal @_imageLoader.load display.iconUrl, @$titleImage @$name.html display.itemName else - @$craftingPlanLink.fadeOut duration:Duration.fast + @$craftingPlanLink.fadeOut duration:Duration.normal @$titleImage.removeAttr 'src' @$name.html '' @@ -89,18 +89,18 @@ module.exports = class ItemPageController extends BaseController if mod?.name?.length > 0 @$bylineLink.attr 'href', Url.mod modSlug:mod.slug @$bylineLink.html mod.name - @$byline.fadeIn duration:Duration.fast + @$byline.fadeIn duration:Duration.normal else - @$byline.fadeOut duration:Duration.fast + @$byline.fadeOut duration:Duration.normal _refreshUsedToMake: -> @_usedToMakeController.title = 'Used to Make' @_usedToMakeController.model = @model.findComponentInItems() if @_usedToMakeController.model? - @$usedToMakeContainer.fadeIn duration:Duration.fast + @$usedToMakeContainer.fadeIn duration:Duration.normal else - @$usedToMakeContainer.fadeOut duration:Duration.fast + @$usedToMakeContainer.fadeOut duration:Duration.normal _refreshRecipes: -> @_recipeControllers ?= [] @@ -123,11 +123,11 @@ module.exports = class ItemPageController extends BaseController controller.model = recipe index++ else - @$recipesSection.fadeOut duration:Duration.fast + @$recipesSection.fadeOut duration:Duration.normal while @_recipeControllers.length > index controller = @_recipeControllers.pop() - controller.fadeOut duration:Duration.fast, complete:-> controller.$el.remove() + controller.fadeOut duration:Duration.normal, complete:-> controller.$el.remove() _refreshSimilarItems: -> group = @model.item?.group @@ -138,9 +138,9 @@ module.exports = class ItemPageController extends BaseController @_similarItemsController.model = null if @_similarItemsController.model? - @$similarContainer.fadeIn duration:Duration.fast + @$similarContainer.fadeIn duration:Duration.normal else - @$similarContainer.fadeOut duration:Duration.fast + @$similarContainer.fadeOut duration:Duration.normal _resolveItemSlug: -> oldItem = @model.item diff --git a/src/scripts/controllers/minimal_recipe_controller.coffee b/src/scripts/controllers/minimal_recipe_controller.coffee index 498aefe52..75d554f1c 100644 --- a/src/scripts/controllers/minimal_recipe_controller.coffee +++ b/src/scripts/controllers/minimal_recipe_controller.coffee @@ -56,7 +56,7 @@ module.exports = class MinimalRecipeController extends BaseController @_imageLoader.load display.iconUrl, @$outputImg - @$el.tooltip show:{delay:Duration.fast, duration:Duration.fast} + @$el.tooltip show:{delay:Duration.snap, duration:Duration.fast} super diff --git a/src/scripts/controllers/mod_page_controller.coffee b/src/scripts/controllers/mod_page_controller.coffee index bafcc5f52..9c6e730fa 100644 --- a/src/scripts/controllers/mod_page_controller.coffee +++ b/src/scripts/controllers/mod_page_controller.coffee @@ -110,14 +110,14 @@ module.exports = class ModPageController extends BaseController while @_groupControllers.length > groupIndex + 1 controller = @_groupControllers.pop() - controller.$el.slideUp duration:Duration.fast, -> @remove() + controller.$el.slideUp duration:Duration.normal, -> @remove() _refreshLink: ($link, url)-> if url? - $link.fadeIn duration:Duration.fast + $link.fadeIn duration:Duration.normal $link.attr 'href', url else - $link.fadeOut duration:Duration.fast + $link.fadeOut duration:Duration.normal _refreshVersions: -> @$versionSelector.empty()