Muramasa
|
04fec51acb
|
Remove null checks
|
2016-09-22 19:17:44 +02:00 |
|
Muramasa
|
436389d3f1
|
For Loop Changes
|
2016-09-22 18:40:19 +02:00 |
|
Muramasa
|
ae471ca1a8
|
Worldgen and random changes
|
2016-09-22 18:35:20 +02:00 |
|
Technus
|
676e4c4e91
|
Made the onFirstTick methods use argument instead
|
2016-09-22 18:16:31 +02:00 |
|
Technus
|
bd924faa07
|
Finally working on first ticks on the teleporter and microwaveET's.
Also minor spelling fix
|
2016-09-22 17:50:53 +02:00 |
|
Technus
|
b374cf7a70
|
Tweaks
|
2016-09-21 22:22:41 +02:00 |
|
Technus
|
9847f73d98
|
Work on tiers
|
2016-09-21 22:22:12 +02:00 |
|
Technus
|
93da2917ed
|
Scanner spacebars O:
|
2016-09-21 22:21:31 +02:00 |
|
Technus
|
5891c4cb36
|
Last bit of work on scanner
|
2016-09-21 22:16:54 +02:00 |
|
Technus
|
2242c65161
|
Scanner initial change
|
2016-09-21 22:14:27 +02:00 |
|
Technus
|
13f4435a02
|
Minor changes - fixed derp in string generation
|
2016-09-21 22:09:51 +02:00 |
|
Technus
|
e9db0f877f
|
Fix Proc even more!
|
2016-09-21 22:07:55 +02:00 |
|
Technus
|
7dfb3e0da9
|
Adjusting multiblocks for bettter tiering
|
2016-09-21 22:05:58 +02:00 |
|
Technus
|
81dc8a48b1
|
no message
|
2016-09-21 22:03:09 +02:00 |
|
Technus
|
66f7ef1cc0
|
EVEN MORE WORK^2
|
2016-09-21 22:03:00 +02:00 |
|
Technus
|
d09a81b501
|
EVEN MORE WORK
|
2016-09-21 22:02:51 +02:00 |
|
Technus
|
5e5ae2fb72
|
Scanner
|
2016-09-08 09:39:42 +02:00 |
|
Technus
|
4430c5b712
|
Scanner spacebars O:
|
2016-09-08 09:26:35 +02:00 |
|
Technus
|
86f5439e1a
|
Scanner work
|
2016-09-08 09:03:44 +02:00 |
|
Technus
|
b7ceab4a53
|
Scanner 2
|
2016-09-07 19:47:16 +02:00 |
|
Technus
|
6198b220ee
|
Scanner 1
|
2016-09-07 19:43:12 +02:00 |
|
Daniel
|
f0c73eda1f
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:19:18 +02:00 |
|
Daniel
|
eedfe0892e
|
Update GT_MetaTileEntity_LargeTurbine_Steam.java
|
2016-09-03 13:19:08 +02:00 |
|
Daniel
|
ced02dc186
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 13:18:56 +02:00 |
|
Daniel
|
05911e2fbd
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 13:18:37 +02:00 |
|
Daniel
|
6d536a232a
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 13:18:25 +02:00 |
|
Daniel
|
7dc2fac9d5
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:18:10 +02:00 |
|
Daniel
|
44a5f3f305
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:17:52 +02:00 |
|
Daniel
|
1de6b9c23a
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 13:17:02 +02:00 |
|
Daniel
|
8e7e866990
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 13:16:23 +02:00 |
|
Daniel
|
7e98a61fa2
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 13:15:05 +02:00 |
|
Dream-Master
|
b8aa41e9df
|
Pollution remove
|
2016-09-03 00:45:47 +02:00 |
|
Dream-Master
|
6125d94033
|
Tiered Teleporter to Fusion Tier 3
Added reverse recipe for Super Conductor Blocks
|
2016-08-25 15:42:16 +02:00 |
|
Léa Gris
|
2550d732e0
|
May or may not fix #565 (LeaGris)
|
2016-08-24 10:19:51 +02:00 |
|
Blood-Asp
|
cff73fd5a3
|
#573 Turbines now explode when producing more EU than dynamo can handle
|
2016-08-23 18:42:23 +02:00 |
|
Dream-Master
|
35f93bee68
|
Delete saved recipe on machine change(Blood Asp)
|
2016-08-22 22:46:15 +02:00 |
|
Dream-Master
|
aa33e48c88
|
Fix Assembly line work without energy(Muramasa)
Assembly line dont work on Z coordinates.(Muramasa)
|
2016-08-22 21:41:44 +02:00 |
|
Dream-Master
|
949c7ba499
|
remove import
|
2016-08-21 21:22:28 +02:00 |
|
Dream-Master
|
ea307b2828
|
Should fix #666
Teleporter need Neutronium Block
|
2016-08-21 19:08:14 +02:00 |
|
Dream-Master
|
11d2e6a516
|
Fix #666
GT Teleporter be Interdimentional with Block of Neutronium
|
2016-08-20 18:23:37 +02:00 |
|
Dream-Master
|
9418bc0954
|
Merge remote-tracking branch 'upstream/SmoothTransition' into experimental
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
|
2016-07-27 17:23:49 +02:00 |
|
OneEyeMaker
|
be79f288a8
|
Added code for Pyrolyse Oven to smoothly replace deprecated coils.
|
2016-07-27 15:26:14 +03:00 |
|
OneEyeMaker
|
078a3bedde
|
Added code for Oil Cracker to smoothly replace deprecated coils.
|
2016-07-27 14:59:56 +03:00 |
|
OneEyeMaker
|
848f84f35c
|
Added code for Multi Smelter to smoothly replace deprecated coils.
|
2016-07-27 13:17:57 +03:00 |
|
OneEyeMaker
|
a8647b8929
|
Added code for Electric Blast Furnace to smoothly replace deprecated coils.
|
2016-07-27 13:02:12 +03:00 |
|
Dream-Master
|
2efe1b9f51
|
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
Conflicts:
.gitignore
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/OrePrefixes.java
src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
src/main/java/gregtech/api/util/GT_BaseCrop.java
src/main/java/gregtech/api/util/GT_Recipe.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_Worldgen_GT_Ore_SmallPieces.java
src/main/java/gregtech/common/GT_Worldgen_Stone.java
src/main/java/gregtech/common/GT_Worldgenerator.java
src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
src/main/java/gregtech/common/blocks/GT_Block_Machines.java
src/main/java/gregtech/common/blocks/GT_Block_Ores.java
src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
src/main/java/gregtech/common/covers/GT_Cover_Arm.java
src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
src/main/java/gregtech/common/covers/GT_Cover_Drain.java
src/main/java/gregtech/common/covers/GT_Cover_EUMeter.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/covers/GT_Cover_Pump.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
src/main/java/gregtech/common/gui/GT_Container_Filter.java
src/main/java/gregtech/common/items/GT_FluidDisplayItem.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_Tool_01.java
src/main/java/gregtech/common/items/GT_SensorCard_Item.java
src/main/java/gregtech/common/items/ItemComb.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.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_DieselGenerator.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.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_Disassembler.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.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_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_LargeBoiler_Bronze.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.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_PyrolyseOven.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
src/main/java/gregtech/common/tools/GT_Tool.java
src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Sense.java
src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.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/postload/GT_CraftingRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
src/main/java/gregtech/loaders/postload/GT_Worldgenloader.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_OreDictionary.java
src/main/resources/assets/gregtech/lang/en_US.lang
src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
|
2016-07-26 18:25:35 +02:00 |
|
OneEyeMaker
|
9946e904b4
|
Merge branch 'experimental' into NewFeatures
|
2016-07-26 09:01:16 +03:00 |
|
Muramasa
|
16cac26b72
|
Separated multiblock overlay and gui textures
|
2016-07-26 00:52:30 +01:00 |
|
Muramasa
|
3bbd32136f
|
Method simplification
Simplified some methods.
Fixed incorrect honey requirement for scanning forestry species.
Tweaked a tooltips.
|
2016-07-25 23:04:21 +01:00 |
|
OneEyeMaker
|
90aa3b51a7
|
4aaafe53f5
|
2016-07-25 23:11:56 +02:00 |
|