Technus
|
4880244781
|
Add duranium and tritanium
|
2016-10-19 11:03:56 +02:00 |
|
Dream-Master
|
6ad32da70f
|
change recipes for Field Generator (Tier balance)
fix #740
|
2016-10-18 22:49:42 +02:00 |
|
Technus
|
be22a87f84
|
Optimize imports (Intelli J)
|
2016-10-08 09:58:24 +02:00 |
|
Muramasa
|
bd49408e97
|
GT crop nerf and separate comb nerf config
|
2016-10-07 18:48:33 +02:00 |
|
Technus
|
999be045f9
|
Loaders from bloodasp code
|
2016-10-07 17:58:04 +02:00 |
|
Dream-Master
|
a5852965aa
|
Change Conductive Iron Recipe using Silver instead of Titanium
|
2016-10-03 18:32:45 +02:00 |
|
siriulx
|
8289b5676e
|
Fix a typo error.
|
2016-10-03 13:21:46 +02:00 |
|
siriulx
|
bedbb5503f
|
Fix the MKII Fusion Casing Recipe
|
2016-10-03 13:21:38 +02:00 |
|
Dream-Master
|
d6a747940c
|
added Carbon Fiber recipes back and add one more
fix #721
|
2016-10-03 12:46:58 +02:00 |
|
Dream-Master
|
5bdc9e7ea4
|
change Coal Fiber recipes
|
2016-10-03 00:03:36 +02:00 |
|
Blood-Asp
|
7718e97e09
|
Pollution bloodasp1
|
2016-10-02 15:15:44 +02:00 |
|
Dream-Master
|
e6c25e86ea
|
Revert "Try this to fix Lathe recipes"
This reverts commit 26300789bb.
|
2016-10-02 10:53:35 +02:00 |
|
Dream-Master
|
26300789bb
|
Try this to fix Lathe recipes
|
2016-10-02 02:22:12 +02:00 |
|
Dream-Master
|
b2d63bf110
|
line fixes
|
2016-10-01 21:44:50 +02:00 |
|
Muramasa
|
372e5193ba
|
2f97e5e890
|
2016-10-01 21:01:00 +02:00 |
|
Blood-Asp
|
761494de6f
|
temporary disable returning of slabs on paper craft because of bug
|
2016-10-01 00:19:25 +02:00 |
|
Blood-Asp
|
154b13560a
|
Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect
|
2016-09-23 19:46:13 +02:00 |
|
Muramasa
|
f27a4b9cbb
|
MORE string var changes
|
2016-09-22 22:09:50 +02:00 |
|
Dream-Master
|
31c3876421
|
Revert "Revert "Changed get clay dust a bit. And diamond out of red sand""
This reverts commit 6675b4242e.
|
2016-09-20 22:02:54 +02:00 |
|
Dream-Master
|
6675b4242e
|
Revert "Changed get clay dust a bit. And diamond out of red sand"
This reverts commit 641677c12e.
|
2016-09-20 22:02:38 +02:00 |
|
Dream-Master
|
641677c12e
|
Changed get clay dust a bit. And diamond out of red sand
|
2016-09-20 22:02:17 +02:00 |
|
Daniel
|
8c6f35294e
|
Update GT_MachineRecipeLoader.java
|
2016-09-01 23:45:23 +02:00 |
|
Daniel
|
662c0ad8e1
|
Update GT_MachineRecipeLoader.java
|
2016-09-01 23:43:30 +02:00 |
|
Daniel
|
e9e515df03
|
Update GT_MachineRecipeLoader.java
|
2016-09-01 23:22:12 +02:00 |
|
Dream-Master
|
895b9d32c5
|
recipe fix
|
2016-08-26 18:52:58 +02:00 |
|
Dream-Master
|
388227ed0c
|
add more infused Gold recipes
|
2016-08-26 18:22:40 +02:00 |
|
Dream-Master
|
39eaf8c194
|
Added new Infused Gold recipes
|
2016-08-26 10:00:03 +02:00 |
|
Dream-Master
|
47d72fc4da
|
Set Nether Star Ore
|
2016-08-25 21:17:08 +02:00 |
|
Dream-Master
|
cfdb3d835b
|
fixes
|
2016-08-25 18:44:23 +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 |
|
Dream-Master
|
7e098d017b
|
Fix #674
Fusion Casings now Assembler only recipes
Using new EBF Tiered Materials like HSSS and Naquadah Alloy.
|
2016-08-25 13:11:58 +02:00 |
|
Dream-Master
|
5a35be495e
|
change Materials a bit
Some Metallurgy Metal adds
|
2016-08-23 22:57:31 +02:00 |
|
Dream-Master
|
7a5d9b73d9
|
Add more mixed Metal Ingot combinations
|
2016-08-21 22:29:54 +02:00 |
|
Dream-Master
|
ea307b2828
|
Should fix #666
Teleporter need Neutronium Block
|
2016-08-21 19:08:14 +02:00 |
|
Dream-Master
|
bc0ec20f89
|
Change recipes for Sensors and Field Generators
|
2016-08-05 22:57:00 +02:00 |
|
Dream-Master
|
5efb45aa2d
|
Remove Low and High Pressure Boiler from RC and add it to the Core Mod
|
2016-08-05 15:18:16 +02:00 |
|
Dream-Master
|
6e0081a170
|
Added Low and High Pressure Boiler from RC to the code new try
|
2016-08-05 10:55:56 +02:00 |
|
Dream-Master
|
c6245c56dc
|
Added Low and High Pressure Boiler from RC to the code( Crafting Recipe and Assembler Recipe )
|
2016-08-05 10:33:43 +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 |
|
OneEyeMaker
|
cda6044614
|
c4bd35d7cd
|
2016-07-26 17:07:31 +02:00 |
|
OneEyeMaker
|
9946e904b4
|
Merge branch 'experimental' into NewFeatures
|
2016-07-26 09:01:16 +03:00 |
|
OneEyeMaker
|
c4bd35d7cd
|
Coils should be deprecated
|
2016-07-26 07:31:57 +03:00 |
|
Blood-Asp
|
bd51aba156
|
Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
|
2016-07-26 00:56:21 +02:00 |
|
OneEyeMaker
|
96e9d081b1
|
13caf1d699
|
2016-07-25 23:16:43 +02:00 |
|
OneEyeMaker
|
90aa3b51a7
|
4aaafe53f5
|
2016-07-25 23:11:56 +02:00 |
|
OneEyeMaker
|
9575e565fd
|
b3279513a3
|
2016-07-25 23:03:52 +02:00 |
|
OneEyeMaker
|
1f1664152c
|
47ce855868
|
2016-07-25 22:55:51 +02:00 |
|
OneEyeMaker
|
0ee26eddb2
|
Fixed Blast Furnace recipe for Naquadah Alloy.
|
2016-07-25 22:53:28 +02:00 |
|
OneEyeMaker
|
d0396c268c
|
f98e51a82f
|
2016-07-25 22:53:13 +02:00 |
|
OneEyeMaker
|
49c063f24a
|
c9bc17bce5
|
2016-07-25 22:18:51 +02:00 |
|