Dream-Master
|
05c272a5ec
|
Put code to GT from Core Mod
|
2016-07-26 22:23:57 +02:00 |
|
Dream-Master
|
5b9614944a
|
Emitter in GT Code
|
2016-07-26 21:09:04 +02: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 |
|
Muramasa
|
de6e90a000
|
Ore system rewrite
|
2016-07-18 19:00:53 +01:00 |
|
Dream-Master
|
98ec8a6bdd
|
Fix id
|
2016-07-05 19:43:45 +02:00 |
|
Dream-Master
|
f1f3c8673b
|
Fixing Ids.
|
2016-07-05 19:25:36 +02:00 |
|
Dream-Master
|
32a4f8be83
|
Added LuV, ZPM and UV Mob Rep
Changed ids from Fluid regulators because overlays ids.
|
2016-07-05 19:20:20 +02:00 |
|
Blood-Asp
|
c320af9f3e
|
Even more changes
|
2016-07-01 22:23:04 +02:00 |
|
Blood-Asp
|
20de7ff06f
|
PR fixes: Turbine casings readded, Dieselgen readded, balancing changes
Also deactivated higher tier pumps, these cover so huge areas, that
servers lag extremely.
Nerfed new cables a bit.
|
2016-07-01 18:08:01 +02:00 |
|
Blood-Asp
|
bcbeebf3b8
|
First Assemblyline recipes
|
2016-07-01 02:06:51 +02:00 |
|
Blood-Asp
|
b465f8f25c
|
Adding LuV, ZPM and UV components
|
2016-07-01 01:41:28 +02:00 |
|
Dream-Master
|
a73309a5e5
|
revert delete bees
|
2016-06-25 15:24:45 +02:00 |
|
Dream-Master
|
05125232c6
|
reverse commit
|
2016-06-25 15:15:16 +02:00 |
|
Dream-Master
|
fc4e0c75b3
|
remove Bees module
|
2016-06-25 14:44:34 +02:00 |
|
Dream-Master
|
8a3ed09c46
|
Blood Asp changes
|
2016-06-24 01:32:57 +02:00 |
|
Blood-Asp
|
72ff25f9b7
|
Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values
|
2016-06-23 23:43:22 +02:00 |
|
Blood-Asp
|
11721a7765
|
Changed Field Generator recipes
|
2016-06-23 01:02:58 +02:00 |
|
Dream-Master
|
65300896c0
|
754300d8fd [754300d]
|
2016-06-22 21:50:07 +02:00 |
|
Dream-Master
|
fb48f27edb
|
0a5ea5afae [0a5ea5a]
|
2016-06-22 21:26:30 +02:00 |
|
Dream-Master
|
fc8ed2e622
|
9b6927e8e3 [9b6927e]
|
2016-06-22 20:46:10 +02:00 |
|
Dream-Master
|
35f51d2f3c
|
e85a2d3e8a [e85a2d3]
|
2016-06-22 20:37:47 +02:00 |
|
Dream-Master
|
7f0ce6117c
|
New Large Fluid Cells
|
2016-06-22 19:54:59 +02:00 |
|
Dream-Master
|
ebb6aea12d
|
952c9d72b0 [952c9d7]
|
2016-06-22 19:48:44 +02:00 |
|
Dream-Master
|
b1d93e3853
|
b563a16e71 [b563a16]
|
2016-06-22 19:47:36 +02:00 |
|
Dream-Master
|
aa14481d3b
|
abc6cfc291 [abc6cfc]
|
2016-06-22 17:22:43 +02:00 |
|
Dream-Master
|
f658c3b362
|
Error fixes
|
2016-06-22 01:33:23 +02:00 |
|
Dream-Master
|
57fa6a070d
|
2cab6b8166 [2cab6b8]
|
2016-06-22 00:45:32 +02:00 |
|
Dream-Master
|
cd29cf4da5
|
4521769f7b [4521769]
|
2016-06-22 00:39:40 +02:00 |
|
Dream-Master
|
f186d60ca4
|
543f71cc97 [543f71c]
|
2016-06-22 00:37:12 +02:00 |
|
Dream-Master
|
52128fdb46
|
b0e7ffa8e5 [b0e7ffa]
|
2016-06-22 00:36:10 +02:00 |
|
Dream-Master
|
cd98901ecf
|
898a045a97 [898a045]
|
2016-06-22 00:30:46 +02:00 |
|
Dream-Master
|
5af854d762
|
87c81f8d85 [87c81f8]
|
2016-06-22 00:25:57 +02:00 |
|
Dream-Master
|
e29201f753
|
new files from gt pull requests
|
2016-06-21 21:36:03 +02:00 |
|
Dream-Master
|
a88d9c4e72
|
experimental branch
|
2016-06-21 21:07:14 +02:00 |
|
Blood-Asp
|
75d71e546b
|
Fix fced86e11a hiding almost all metaitems
|
2016-06-21 19:51:54 +02:00 |
|
Dream-Master
|
fafe1bcc88
|
reverse commit
|
2016-06-21 19:32:31 +02:00 |
|
Dream-Master
|
09add3e8ac
|
even with Blood asp experimental branch
|
2016-06-21 18:50:29 +02:00 |
|
Dream-Master
|
b09b54435f
|
remove all
|
2016-06-21 18:42:02 +02:00 |
|
Blood-Asp
|
8269cd58e6
|
Fix wrong energy values for comp and crop processing
|
2016-06-20 00:07:55 +02:00 |
|
Blood-Asp
|
491a6d6c4b
|
Plunger also emptys input tank after output tank is empty
|
2016-06-19 22:44:28 +02:00 |
|
Blood-Asp
|
96607760e1
|
EnderIO Wrench Support
|
2016-06-19 18:23:28 +02:00 |
|
Muramasa
|
79fc84d5d2
|
isPlasmaCellUsed additional null check
|
2016-05-26 00:55:34 +01:00 |
|
Muramasa
|
fced86e11a
|
Fixes #268. Shows plasma cells that have a fusion recipe
|
2016-05-26 00:52:09 +01:00 |
|
Muramasa
|
bbcc38e930
|
More fixes for #507
|
2016-05-25 19:16:41 +01:00 |
|
Dream-Master
|
48dac29710
|
Thaumcraft Aspect fix
|
2016-05-22 01:47:08 +02:00 |
|
Technus
|
6d95adb9fd
|
Update GT_MetaGenerated_Item_01.java
|
2016-04-19 18:43:16 +02:00 |
|
Technus
|
59503f56af
|
Update GT_MetaGenerated_Item_01.java
|
2016-04-19 18:12:35 +02:00 |
|
Technus
|
94b7324b5a
|
Changed Motor recipes.
|
2016-04-19 17:59:59 +02:00 |
|
Dream-Master
|
0a5ea5afae
|
fix #565
Change Motors to have max 4 cable instead of 16
|
2016-04-17 22:37:37 +02:00 |
|
Draknyte1
|
36a97e706b
|
Submitting PR's is a pain.
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
|
2016-04-11 20:47:30 +10:00 |
|