Technus
|
39be4ae1ed
|
EBF 20000K disable auto genned recipe support
|
2017-05-05 09:49:18 +02:00 |
|
Dream-Master
|
5d9f752e6e
|
more component recipe changes
|
2017-05-04 09:47:37 +02:00 |
|
Dream-Master
|
f4e88cb51d
|
a few chip recipe changes, png changes
|
2017-05-02 23:57:20 +02:00 |
|
Dream-Master
|
f2bb29d4b5
|
more Board recipe and balancing changes
|
2017-05-02 22:32:24 +02:00 |
|
Dream-Master
|
6cc7e7f0d8
|
fixed Board recipes a bit
|
2017-05-02 22:17:13 +02:00 |
|
Dream-Master
|
dd4754c733
|
removed unused pngs
|
2017-05-02 22:14:25 +02:00 |
|
Dream-Master
|
c7c207038f
|
make things more easy and realistic
|
2017-05-02 22:10:44 +02:00 |
|
Dream-Master
|
8efc90b6f6
|
more recipes changed
|
2017-05-01 22:55:54 +02:00 |
|
Dream-Master
|
748cbf8a5a
|
added cutter and Chemical reactor to cleanroom (optional recipes)
a few recipe changes
|
2017-05-01 17:55:23 +02:00 |
|
Dream-Master
|
ab44824714
|
more advanced circuit Board changes
|
2017-05-01 14:35:08 +02:00 |
|
Dream-Master
|
086e2a1dcb
|
new Etched wire recipes
|
2017-05-01 13:10:44 +02:00 |
|
Dream-Master
|
7257c60326
|
Added back Etched wires
Added new Bords
|
2017-05-01 12:38:15 +02:00 |
|
Technus
|
254306ebfd
|
Not needed
|
2017-05-01 10:28:29 +02:00 |
|
Technus
|
f2b8bbdde8
|
Optimize imports
|
2017-05-01 10:24:30 +02:00 |
|
Technus
|
80bf3fd2e6
|
Not needed.
|
2017-05-01 09:40:28 +02:00 |
|
Technus
|
bd816f505b
|
Random text changes.
|
2017-05-01 08:22:53 +02:00 |
|
Technus
|
cb0f1d4d2c
|
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
|
2017-05-01 08:22:05 +02:00 |
|
Technus
|
c12e474c23
|
Oil and pollution overhaul
|
2017-05-01 08:18:30 +02:00 |
|
Dream-Master
|
417d45d257
|
Added Advanced Fiber Glass Board
Few recipe changes
|
2017-05-01 00:00:44 +02:00 |
|
Dream-Master
|
618674ae6c
|
more high Tier circuit recipe changes
|
2017-04-30 23:34:06 +02:00 |
|
Dream-Master
|
c84c31709a
|
change png because all circuits looks the same
|
2017-04-30 23:01:29 +02:00 |
|
Dream-Master
|
8098f5c8c3
|
second recipe for diode
|
2017-04-30 21:52:00 +02:00 |
|
Dream-Master
|
9545f8f232
|
fix recipe basic circuit
machine recipe loader file was to large. I divided it again @Technus are this ok or did i derp here?
|
2017-04-30 21:42:54 +02:00 |
|
Dream-Master
|
2c215757b3
|
integrated processor changes
|
2017-04-30 21:14:05 +02:00 |
|
Dream-Master
|
d0d53843d5
|
Capacitor recipe change
|
2017-04-30 20:49:21 +02:00 |
|
Dream-Master
|
97abdb5967
|
Epoxid Board changes
|
2017-04-30 20:36:22 +02:00 |
|
Dream-Master
|
5784c6fb13
|
change the sticks in advanced circuits
|
2017-04-30 20:17:21 +02:00 |
|
Dream-Master
|
e64cca3d18
|
advanced circuits and Transistor changings
|
2017-04-30 20:10:40 +02:00 |
|
Dream-Master
|
8661cebf89
|
more changes circuits
|
2017-04-30 16:28:43 +02:00 |
|
Dream-Master
|
856b8946e5
|
more circuit changes
|
2017-04-30 16:18:40 +02:00 |
|
Dream-Master
|
0bfb05c7f7
|
This should work
|
2017-04-30 15:27:09 +02:00 |
|
Dream-Master
|
da11b91d56
|
try to add clean room recipes
|
2017-04-30 15:18:22 +02:00 |
|
Dream-Master
|
6f65d3ab87
|
fix circuit exploit
|
2017-04-30 11:42:59 +02:00 |
|
Dream-Master
|
14ae461281
|
rework circuits Basic and Good
|
2017-04-30 11:25:45 +02:00 |
|
Dream-Master
|
15e92afd02
|
Added new Boards and new fluids
|
2017-04-30 00:51:46 +02:00 |
|
Dream-Master
|
e88cb7d796
|
remove gt circuit out of nc recipes
|
2017-04-29 11:01:00 +02:00 |
|
Dream-Master
|
5841db6733
|
derp
|
2017-04-28 23:59:12 +02:00 |
|
Dream-Master
|
aecff8261d
|
fix derp
|
2017-04-28 23:35:29 +02:00 |
|
Dream-Master
|
7459d68818
|
fixed to jump from basic circuit to integrated circuit
|
2017-04-28 23:24:01 +02:00 |
|
Dream-Master
|
22f0af1b72
|
change circuits parts a bit.
|
2017-04-28 23:13:57 +02:00 |
|
Technus
|
1bafd2ad55
|
Runnable state achieved
|
2017-04-27 20:12:14 +02:00 |
|
Technus
|
0ce4e84512
|
Disable , unused
|
2017-04-27 19:43:12 +02:00 |
|
Technus
|
00abad266c
|
Merge branch 'unstable' into mergeGTNH
# Conflicts:
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
# src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
|
2017-04-27 19:42:17 +02:00 |
|
Technus
|
244ef3810e
|
Buildable
|
2017-04-27 19:03:07 +02:00 |
|
Blood-Asp
|
e7d8d5ecbe
|
Merge pull request #1025 from JohannesGaessler/SteamProductionImprovement
Steam production improvement / Tooltip improvement / Pollution adjustment
|
2017-04-27 18:26:42 +02:00 |
|
Blood-Asp
|
77e1b53724
|
Merge pull request #1038 from Techlone/fix_assline_eu_production
Fix eu consumption absence by AssemblyLine and some clean up
|
2017-04-27 18:22:48 +02:00 |
|
Technus
|
f6214c5b25
|
Merge branch 'unstable' into mergeGTNH
|
2017-04-27 17:11:52 +02:00 |
|
Technus
|
929073a7ae
|
Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)
# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/enums/Materials.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
# src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
# src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
# src/main/java/gregtech/common/gui/GT_Container_Regulator.java
# src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java
# src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
# src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png
|
2017-04-27 17:06:22 +02:00 |
|
Techlone
|
cae69aa28f
|
Fix eu consumption absence by AssemblyLine and some clean up
|
2017-04-27 19:35:07 +05:00 |
|
Blood-Asp
|
07aa57e7de
|
Merge pull request #1032 from Techlone/fix_micro_recipies_1029
Fix micro recipies
|
2017-04-27 16:27:09 +02:00 |
|