Dream-Master
7a872dfad2
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
2016-07-26 19:41:49 +02:00
OneEyeMaker
9c788fa292
Restored TextureSets
2016-07-26 20:02:41 +03:00
Dream-Master
1512c3cdce
fixes
2016-07-26 18:30:30 +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
c014ae4afc
Fixed merge conflicts.
2016-07-26 17:10:23 +02:00
OneEyeMaker
cda6044614
c4bd35d7cd
2016-07-26 17:07:31 +02:00
OneEyeMaker
eec5b2faa7
Fixed merge conflicts.
2016-07-26 09:02:10 +03: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
Muramasa
16cac26b72
Separated multiblock overlay and gui textures
2016-07-26 00:52:30 +01:00
Blood-Asp
bd51aba156
Merge pull request #576 from Muramasa-/UBCSupport
...
UBC Support / Ore System Restructure
2016-07-26 00:56:21 +02: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
Dream-Master
0dc0085f6f
final fixes
2016-07-25 23:20:48 +02:00
OneEyeMaker
96e9d081b1
13caf1d699
2016-07-25 23:16:43 +02:00
OneEyeMaker
c485ef4720
b6e4f869b8
2016-07-25 23:13:40 +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
d8b84d375c
2f454b9d82
2016-07-25 22:58:04 +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
aca07ff36e
ea5305f7df
2016-07-25 22:51:10 +02:00
OneEyeMaker
6121acb843
8bf5b61dea
2016-07-25 22:48:54 +02:00
OneEyeMaker
f365377332
ce1e6917e0
2016-07-25 22:45:30 +02:00
OneEyeMaker
718d28bd23
ea5305f7df
2016-07-25 22:36:29 +02:00
OneEyeMaker
18ab1c12cc
Naquadah should be more expensive.
2016-07-25 22:32:51 +02:00
OneEyeMaker
0fb3329176
8bf5b61dea
2016-07-25 22:32:25 +02:00
OneEyeMaker
e3d5764684
ce1e6917e0
2016-07-25 22:29:30 +02:00
OneEyeMaker
b3777e1eca
Now Naquadria (source of Neutronium) requires highest tier of heating coils.
2016-07-25 22:23:38 +02:00
OneEyeMaker
218d45c99d
b780ef6c2c
2016-07-25 22:23:13 +02:00
OneEyeMaker
49c063f24a
c9bc17bce5
2016-07-25 22:18:51 +02:00
OneEyeMaker
13caf1d699
Changed method of "repairing" of overheated coils.
...
Also moved initialization of SubTags to prevent NoClassDefFoundException.
2016-07-25 11:33:07 +03:00
OneEyeMaker
b6e4f869b8
Redesigned achievements.
2016-07-24 15:47:50 +03:00
DEMOOH
a5ba9e57fa
Update GT_FuelLoader.java
...
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
2016-07-24 15:32:26 +03:00
OneEyeMaker
4aaafe53f5
Changed Blast Furnace temperatures of some materials.
...
Now EV materials require HV+ heating coils, IV materials requires EV+ coils.
2016-07-24 10:27:03 +03:00
Muramasa
d756cebd17
Fix "stone" veins
...
Fix an issue where an "stone" vein would override ore textures but not
other stones.
Added missing small ore for marble and basalt.
Removed wither check from Block_Stones.
2016-07-23 03:09:25 +01:00
Muramasa
2704680a2e
Fix convertOre
2016-07-22 04:31:57 +01:00
Muramasa
5fe4798e6b
Fix harvest level
2016-07-22 02:58:39 +01:00
Muramasa
676e326ec0
Various fixes/cleanup
...
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
2016-07-22 01:41:51 +01:00
OneEyeMaker
b3279513a3
Any component should require cables of its tier.
2016-07-21 16:59:56 +03:00
OneEyeMaker
2f454b9d82
Cables from IV materials and used as IV components should be IV.
2016-07-21 13:22:28 +03:00
DEMOOH
aa2196978b
Update GT_MachineRecipeLoader.java
...
Added pitchblende multiplication recipe with Reactoria leaves.
2016-07-21 11:28:19 +03:00
Muramasa
248ce596a5
Ore System Rewrite part 2
...
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
2016-07-21 07:24:42 +01:00
OneEyeMaker
47ce855868
Redefined some wires. Added last heating coil block.
2016-07-21 08:48:22 +03:00
OneEyeMaker
b7943a30c3
Fixed Blast Furnace recipe for Naquadah Alloy.
2016-07-20 10:45:46 +03:00
OneEyeMaker
f98e51a82f
Added new tier of heating coils.
...
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03:00
Dream-Master
eeab702de4
Fix Multismelter
...
Change Wire recipe and Fix 643
2016-07-18 22:32:39 +02:00
Muramasa
de6e90a000
Ore system rewrite
2016-07-18 19:00:53 +01:00
OneEyeMaker
bd689c6253
Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible
...
Heating coils moved to separated block.
2016-07-18 15:44:35 +03:00
OneEyeMaker
ea5305f7df
Restored broken compatibility.
2016-07-18 14:56:21 +03:00
OneEyeMaker
2b9d87f293
Naquadah should be more expensive.
2016-07-18 10:16:55 +03:00
OneEyeMaker
8bf5b61dea
Moved all coils to another block.
2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0
Preparations for moving all heating coils to another block.
2016-07-18 09:06:26 +03:00
OneEyeMaker
effe6699f5
Now Naquadria (source of Neutronium) requires highest tier of heating coils.
2016-07-17 17:29:18 +03:00
OneEyeMaker
b780ef6c2c
Updated tooltips
2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5
Added new heating coil blocks.
2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5
Initial
...
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
2016-07-16 23:48:25 +01:00
DEMOOH
8419ddaefc
Update GT_Cover_Fluidfilter.java
2016-07-17 00:07:10 +03:00
Dream-Master
c3ccf315a2
Add shaped crafting recipe for springs
2016-07-15 22:35:15 +02:00
Dream-Master
f4d10ee72f
change recipe for small springs
2016-07-15 22:17:47 +02:00
Dream-Master
8cb17b20c0
Adding Shaped recipe for small springs
2016-07-15 00:21:18 +02:00
Martin
2a4e2aa133
Remove ghost items from Assembly Line input slots (Blood Asp)
2016-07-13 16:25:28 +02:00
Blood-Asp
be3a6292bb
Remove ghost items from Assembly Line input slots
2016-07-12 22:04:36 +02:00
Blood-Asp
435c3cd526
Update GT Capelist URL
2016-07-10 20:28:35 +02:00
Dream-Master
4030ef4f1c
Change graphic
2016-07-05 19:58:04 +02:00
Dream-Master
509b904d4e
Change graphics
2016-07-05 19:54:33 +02: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
Dream-Master
467f983190
Change Pile Igniter recipe to be LV Steel.
2016-07-04 22:50:39 +02:00
Dream-Master
bdff360684
Change cable to be using rubber instead of wool.
...
Added 16X Insulated cables
2016-07-04 22:14:50 +02:00
Dream-Master
3ce817dddb
More Pollution work
2016-07-04 18:41:53 +02:00
Dream-Master
a22dc1f3e4
Pollution base work (Blood Asp)
2016-07-04 18:37:34 +02:00
Dream-Master
51f2d56284
Name fixes Assembly Line (Blood Asp)
2016-07-04 17:53:32 +02:00
Dream-Master
5b626efd74
Rised generator internal EU storage to counter production bug (Blood Asp)
2016-07-04 17:50:19 +02:00
Dream-Master
26237d91d1
rebalancing sifting output (Blood Asp)
2016-07-04 17:48:00 +02:00
Dream-Master
b99feff3d8
make GT trigger ic2 achievements (Blood Asp)
2016-07-04 17:46:17 +02:00
Dream-Master
a9039f249a
Finished adding all component assemblyline recipes (Blood Asp)
2016-07-04 17:39:38 +02:00
Blood-Asp
704d534b43
More Pollution work
2016-07-03 18:35:51 +02:00
Blood-Asp
57deb3b3e1
Pollution basework
2016-07-03 18:31:06 +02:00
Blood-Asp
d21357bd84
Name fixes
2016-07-03 12:37:21 +02:00
Blood-Asp
f027492fb2
Rised generator internal EU storage to counter production bug
2016-07-03 11:55:45 +02:00
Blood-Asp
c57aeee3ce
rebalancing sifting output
2016-07-02 23:28:43 +02:00
Blood-Asp
ca0b8f396e
make GT trigger ic2 achievements
2016-07-02 22:35:29 +02:00
Blood-Asp
c120f69351
Finished adding all component assemblyline recipes
2016-07-02 19:05:17 +02:00
Dream-Master
599095c7dc
fix ic2 crash (Blood Asp)
2016-07-02 12:45:52 +02:00
Blood-Asp
d328f7bc88
Fix IC2 glass crash
2016-07-02 12:40:30 +02:00
Dream-Master
f39e81fc90
change Electric Tiers
2016-07-02 12:14:21 +02:00
Dream-Master
ae5626bc38
More fixes
...
Naquadah Alloy and Osmiridium
2016-07-02 12:10:30 +02:00
Dream-Master
050d5d5291
More fixes
2016-07-02 11:57:34 +02:00
Dream-Master
6cff64480a
Adding new Tooltip to Assembly Line
...
Adding Iridium and Naquada ingots in EBF
Fix zpm Motor (Blood Asp)
2016-07-02 11:49:10 +02:00
Dream-Master
c579f73733
Add Argon Gas
2016-07-02 11:36:58 +02:00
Dream-Master
df720f7ace
Adding Blood Infused Iron to GT
...
More recipe changes (Blood Asp)
2016-07-02 11:31:02 +02:00
Blood-Asp
c320af9f3e
Even more changes
2016-07-01 22:23:04 +02:00
Dream-Master
e10a473d31
visual changes
2016-07-01 22:16:20 +02:00
Blood-Asp
c2be6ff64c
Small fixes and rebalances
2016-07-01 21:44:44 +02:00
Dream-Master
a560557fdf
fix Stuff
2016-07-01 18:54:08 +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
Muramasa
1b162ae25e
Changed wire/rotor components
2016-07-01 15:41:08 +01:00
Muramasa
63f64cb514
Initial
2016-07-01 13:15:55 +01:00
Dream-Master
aa35ec7ccd
Turbine tooltip fixes(Muramasa)
2016-07-01 09:05:24 +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
Blood-Asp
1497dc47e5
Merge pull request #550 from Muramasa-/Default
...
Turbine tooltip fixes
2016-07-01 01:16:10 +02:00
Blood-Asp
f496def067
Fixed Pyrooven overclocking
2016-07-01 01:14:35 +02:00
Blood-Asp
73749472d2
Finish Assemblyline recipe printing
2016-07-01 01:13:09 +02:00
Dream-Master
c3fcd31146
Finish Assemblyline recipe check (Blood Asp)
2016-06-30 22:28:48 +02:00
Blood-Asp
7ee09889d9
Finish Assemblyline recipe check
2016-06-30 22:17:18 +02:00
Dream-Master
6daf342c2f
fix
2016-06-30 21:47:08 +02:00
Dream-Master
857fb7ec02
Assembly Line recipe work (Blood Asp)
2016-06-30 21:24:13 +02:00
Dream-Master
7c6c34ed0f
Make plasma turbine output cooled versions of plasma (Blood Asp)
2016-06-30 20:18:58 +02:00
Muramasa
d8df9e1565
Turbine tooltip fixes
2016-06-30 18:14:34 +01:00
Blood-Asp
173e5a11d7
Merge pull request #547 from perkinslr/experimental
...
Make plasma turbine output cooled versions of plasma
2016-06-30 14:49:25 +02:00
Logan Perkins
ad8ad42542
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
2016-06-29 22:37:41 -07:00
Blood-Asp
90d776893e
More Assembly Line recipe work
2016-06-30 00:12:00 +02:00
Dream-Master
02c801afac
fix
2016-06-29 08:48:37 +02:00
Blood-Asp
22525fd6e8
Merge pull request #546 from perkinslr/experimental
...
Fix 'cannot find symbol' error in AdvMiner2
2016-06-29 00:23:44 +02:00
Dream-Master
db3b2e1a4a
fix adv miner
...
comit form perkinslr
2016-06-28 08:49:31 +02:00
Logan Perkins
fcb685693e
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:28:18 -07:00
Logan Perkins
9be4d8c270
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:20:47 -07:00
Logan Perkins
4adb6554c2
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:12:02 -07:00
Blood-Asp
b9ee95c797
AL Recipe work
2016-06-27 23:49:18 +02:00
Dream-Master
3d9a779242
fix thanks @Muramasa
2016-06-27 16:56:24 +02:00
Dream-Master
5de110ad42
This works
...
HeeEndium
2016-06-26 23:43:15 +02:00
Dream-Master
4046c52835
Change Material HEE Endium
2016-06-26 23:30:14 +02:00
Dream-Master
33722641e6
change back name
2016-06-26 11:12:19 +02:00
Logan Perkins
dfb263e7dd
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-25 15:43:13 -07: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
c612ec5d0d
fixing materials
2016-06-25 12:48:19 +02:00
Dream-Master
e59aa14e5e
fix
2016-06-25 11:26:55 +02:00
Dream-Master
a99ba0e265
Silk-touch then pulverize ores in advanced miner II
2016-06-25 11:25:23 +02:00
Logan Perkins
1fe2787532
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 20:50:10 -07:00
Logan Perkins
577ea17e65
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 20:45:04 -07:00
Logan Perkins
9ed45df5b7
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 16:18:03 -07:00
Blood-Asp
01b15f4251
Make Railcraft item Retrival name independent
2016-06-25 00:24:25 +02:00
Dream-Master
fe93065662
Adding Manyullyn to materials
2016-06-24 23:50:15 +02:00
Dream-Master
5e1720e282
Revert "make steam boilers not automatable"
2016-06-24 20:44:28 +02:00
Dream-Master
efaa163cfe
Fix Superfuel railcraft compat and expand thaumcraft check (Blood Asp)
2016-06-24 19:35:57 +02:00
Blood-Asp
e21311b919
Fix Superfuel railcraft compat and expand thaumcraft check
2016-06-24 17:49:22 +02:00
Dream-Master
8a3ed09c46
Blood Asp changes
2016-06-24 01:32:57 +02:00
Blood-Asp
cea067c613
More superfuel fixes
2016-06-24 01:08:26 +02:00
Blood-Asp
25a0b460d4
Fix fluiddeath
2016-06-24 00:57:45 +02:00
Blood-Asp
df6e07b5cd
Merge pull request #537 from Muramasa-/DieselGenerator
...
Fuel efficiency changes for Large Diesel Engine
2016-06-24 00:41:46 +02:00
Blood-Asp
104715c86c
missed a bit
2016-06-23 23:44:07 +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
Dream-Master
ce97f9d852
Fix Fluid Wet Concrete
...
remove Plasma Pie we have Neutronium for it.
2016-06-23 22:33:31 +02:00
Muramasa
5263c85dc5
Fuel efficiency changes for Large Diesel Engine
2016-06-23 20:02:43 +01:00
Blood-Asp
210fc268b1
Remove old crop processing code
2016-06-23 19:31:02 +02:00
