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
Dream-Master
f5e078aa1e
fix derp
2017-04-18 00:00:03 +02:00
Dream-Master
8d539f2e54
change Energy Crystal recipe a bit.
2017-04-17 23:02:55 +02:00
Blood-Asp
2ee3b7e712
Merge pull request #1018 from JohannesGaessler/NeiLargeBoilerFuelEntires
...
NEI Large Boiler Fuel Tab
2017-04-13 23:33:13 +02:00
Johannes Gäßler
7044deb43b
Added a recipe for Thaumcraft Alumentum and some other items
...
Iterating over items and checking for fuel values turned out to not give
good results because it ignores the Ore Dictionary.
For instance there would be a page for only oak logs instead of a page
with wood in general.
2017-04-13 23:21:35 +02:00
Johannes Gäßler
2064e0b12c
Explicitly added some Solid Fuels to the Large Boiler Fuel tab.
...
I was unable to automatically add all fuels to the tab.
2017-04-11 00:47:56 +02:00
Johannes Gäßler
822cf1ec3e
Expanded the NEI api to allow for custom descriptions, added liquid
...
fuels to the newly created Large Boiler tab
Instead of the default information like total EU or EU usage it is now
possible to provide custom Strings to describe a recipe.
The Large Boiler NEI tab explicitly shows burn times for fuels depending
on the boiler used.
Any liquid fuel added to Diesel Fuels or Semifluid Fuels will
automatically be added to Large Boiler Fuels.
2017-04-10 20:57:44 +02:00
Blood-Asp
ee5af6ac40
Fixing names for plastics
2017-04-10 13:07:13 +02:00
Blood-Asp
706d2e4bd5
All foils can be made in bender.
2017-04-10 12:54:11 +02:00
Blood-Asp
13043923c0
Fix compile issue
2017-04-10 12:47:50 +02:00
Technus
08036ff192
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-04-07 01:58:15 +02:00
Technus
4bfb425096
Should fix one bug case on transformers?
2017-04-07 01:57:52 +02:00
Dream-Master
8470f9dd45
make good circuits a bit cheaper
2017-04-04 22:47:31 +02:00
Dream-Master
e8a332aa76
Good Circuits recipes are to cheap. Will add the change into Quests.
2017-04-04 17:00:11 +02:00
Archengius
8081ba10df
Remove deprecated api..
2017-04-03 16:37:25 +07:00
Technus
c7f8240336
I think that would be required also... Fusion fix
2017-04-03 09:16:24 +02:00
Technus
68f5479199
Fusion fix
2017-04-03 09:07:44 +02:00
Blood-Asp
9edf005c3c
Regulator fix
2017-04-03 08:47:41 +02:00
Technus
bde230b96d
Apply amperage correctly in proc arrays
2017-04-03 08:44:36 +02:00
Blood-Asp
454b255f1b
Fix regulator crash bug
2017-04-01 12:26:47 +02:00
Technus
1c7787e535
Neutronium should had no plasma anyways... (prepairing ground for EM)
2017-04-01 09:51:15 +02:00
Blood-Asp
f94ae649be
Move some recipes since max java method size was reached
2017-04-01 01:25:30 +02:00
Blood-Asp
6f5e16b286
Updated Achievements to fit changed circuits
2017-04-01 01:03:52 +02:00
Blood-Asp
998709430c
Fix typo
2017-03-31 22:37:51 +02:00
Blood-Asp
7beabd163a
catch most modular armor crashes
2017-03-31 22:24:36 +02:00
Blood-Asp
d41d3cd2b3
Add assemblyrecipes for all circuits per oredict
2017-03-31 22:24:15 +02:00
Blood-Asp
b5626433b9
Better logging for oregen
2017-03-31 21:27:50 +02:00
Blood-Asp
f030951982
Config for blocks below crops
2017-03-31 21:19:04 +02:00
Blood-Asp
32a21a0ac1
Remove testline
2017-03-31 19:02:45 +02:00
Blood-Asp
dd8510792f
Detect low grav dimensions by world provider
2017-03-31 19:01:32 +02:00
Dream-Master
8cb67c05f7
bump version
2017-03-31 18:19:40 +02:00
Technus
8769d0c29c
Fixed NPE
2017-03-31 18:07:00 +02:00
Blood-Asp
944f1dab7e
Missed a file
2017-03-31 17:38:48 +02:00
Blood-Asp
4fc431e77e
Add Lightning Rod
2017-03-31 17:38:29 +02:00
Blood-Asp
d725c463e5
null check to prevent bukkit crash
2017-03-31 16:14:36 +02:00
Dream-Master
7d34b02f78
Now its fixed ?
...
https://github.com/GTNewHorizons/NewHorizons/issues/1252
2017-03-30 18:53:24 +02:00
Dream-Master
b49cbf59c5
Now its fixed ?
...
https://github.com/GTNewHorizons/NewHorizons/issues/1252
2017-03-29 14:57:06 +02:00
Dream-Master
3aee6063cc
Assembly Line configuration. #1252
...
@ VermillionX hope i get it right can you verifying it please?
https://github.com/GTNewHorizons/NewHorizons/issues/1252
2017-03-29 14:48:34 +02:00
Dream-Master
233ccbaa8f
Fixed recipe
2017-03-29 13:26:13 +02:00
Dream-Master
c14673cab2
Code cleanup
...
Add recipe for Netherstar Dust to Netherstars in code
2017-03-29 13:08:37 +02:00
Blood-Asp
1cf68bbcdf
Naquadah gen tiers
2017-03-26 21:38:39 +02:00
Blood-Asp
5771ee4e55
Merge pull request #987 from Sirse/unstable
...
Fix NEI NoClassDefFoundError
2017-03-26 21:17:01 +02:00
Blood-Asp
024a5adab1
Merge pull request #981 from dohyun22/patch-1
...
Fixed various Bugs on the Powderbarrel.
2017-03-26 21:16:22 +02:00
Blood-Asp
aea62155c0
Merge pull request #988 from Dimach/unstable
...
Fix #982 , #986 .
2017-03-26 21:14:55 +02:00
Dream-Master
f7f8f5fb79
idk which mod add it.
2017-03-26 20:52:16 +02:00
Dream-Master
716cfdff32
remove everything from ichorium
2017-03-26 20:44:15 +02:00
Dimach
324a4cc312
Cleanup code.
2017-03-26 21:00:17 +03:00
Dimach
3654c51469
Fix #982 , #986 .
2017-03-26 20:58:16 +03:00
Sirse
c3f9137218
Fix NEI NoClassDefFoundError
...
Ensure is NEI loaded before call their API methods
2017-03-27 00:02:13 +07:00
Dream-Master
73629059c9
Add Ichorium as a material to GT Code
2017-03-26 12:34:05 +02:00
