aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-06 22:12:41 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-06 22:12:41 +1000
commita858b50d7fe80dd2d030500d931c40411ce13676 (patch)
tree2c7919aea3a89cdcaebdb0f8412a3bb54fe33c64 /src/Java/gtPlusPlus
parentcbe0e497be8e466c380a5b4fa781b314ede9ada3 (diff)
downloadGT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.tar.gz
GT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.tar.bz2
GT5-Unofficial-a858b50d7fe80dd2d030500d931c40411ce13676.zip
+ Added two new recipes for etched IV wiring. Should help with #35
+ Re-did imports again, from the desktop, with looser rules.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java20
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java1
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java2
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java4
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java9
-rw-r--r--src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java2
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_NHG.java4
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_Workbench.java15
-rw-r--r--src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java15
-rw-r--r--src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java6
-rw-r--r--src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java38
-rw-r--r--src/Java/gtPlusPlus/core/handler/GuiHandler.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java7
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java8
-rw-r--r--src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java4
-rw-r--r--src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java25
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseEuItem.java22
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java15
-rw-r--r--src/Java/gtPlusPlus/core/item/base/CoreItem.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityEffect.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityEpic.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityRare.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java21
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java8
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java4
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java6
-rw-r--r--src/Java/gtPlusPlus/core/proxy/ClientProxy.java5
-rw-r--r--src/Java/gtPlusPlus/core/proxy/ServerProxy.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java5
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java7
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java6
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java3
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotCrafting.java6
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java5
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/ClassUtils.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/LoggingUtils.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java15
-rw-r--r--src/Java/gtPlusPlus/core/util/UtilsChatFormatting.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java18
-rw-r--r--src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java4
-rw-r--r--src/Java/gtPlusPlus/core/util/entity/EntityUtils.java7
-rw-r--r--src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java10
-rw-r--r--src/Java/gtPlusPlus/core/util/item/ItemUtils.java3
-rw-r--r--src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/networking/NetworkUtils.java8
-rw-r--r--src/Java/gtPlusPlus/core/util/player/PlayerCache.java16
-rw-r--r--src/Java/gtPlusPlus/core/util/player/PlayerUtils.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java11
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java26
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java21
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java16
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java11
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java19
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java15
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipeRegistrator.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java23
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java4