Blood-Asp
e957422390
Give ore Achievements from all ore stone types
2016-10-17 14:36:30 +02:00
Blood-Asp
14304fceb8
Exploding GT machines now drop randomly some of their crafting components.
2016-10-17 13:46:08 +02:00
Blood-Asp
c11d921166
Return slabs on paper craft(this time without bug)
2016-10-14 11:01:17 +02:00
Technus
be22a87f84
Optimize imports (Intelli J)
2016-10-08 09:58:24 +02:00
Technus
999be045f9
Loaders from bloodasp code
2016-10-07 17:58:04 +02:00
Muramasa
789199a578
Concurrent Hash maps and string vars
2016-09-22 19:10:30 +02:00
Muramasa
436389d3f1
For Loop Changes
2016-09-22 18:40:19 +02:00
Technus
0218bda946
Reauthored bees to GT
2016-09-21 22:22:59 +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
c485ef4720
b6e4f869b8
2016-07-25 23:13:40 +02:00
OneEyeMaker
b6e4f869b8
Redesigned achievements.
2016-07-24 15:47:50 +03:00
Dream-Master
b99feff3d8
make GT trigger ic2 achievements (Blood Asp)
2016-07-04 17:46:17 +02:00
Blood-Asp
ca0b8f396e
make GT trigger ic2 achievements
2016-07-02 22:35:29 +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
a88d9c4e72
experimental branch
2016-06-21 21:07:14 +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
dc2a48259a
Merge pull request #518 from Muramasa-/TweaksAndFixes
...
Crash Fix / Various Tweaks
2016-05-27 20:11:07 +02:00
Muramasa
ab6c431b88
Rearranged two achievements. Fixes #478
2016-05-25 22:25:24 +01:00
OneEyeMaker
5169c509d6
Added configuration file to enabling processing of ores
2016-05-18 07:41:36 +03:00
Blood-Asp
41af922dd2
Gunpowder no longer unlocks clean dust achievement
2016-03-20 16:51:01 +01:00
Blood-Asp
009c032c13
Hiding of Recycling recipes and unneeded ores in NEI
2016-03-20 16:47:17 +01:00
Dream-Master
faa4c18f63
Added Blood Asps commits.
...
New debug lang for achievements generation(miuirussia)
fuel rod override v2(Blood Asp) Mox not working lik ic2 any more (more heat up more eu)
Overriding IC2 fuel rods(Blood Asp)
fix teleporter(Blood Asp)
Sensor kit should not stack(Blood Asp)
Fix teleporter nuclear control support(Blood Asp)
Fixed Display overflow(Blood Asp)
2015-12-28 21:04:13 +01:00
MIUI Russia
9e518a885e
New debug lang for achievements generation
2015-12-25 18:21:50 +03:00
Blood-Asp
cc3631c8ae
Made bees a bit less biome dependend
2015-12-21 16:58:06 +01:00
Blood-Asp
370e46215b
small fixes
2015-12-11 04:55:22 +01:00
Dream-Master
55ed43f4ce
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
2015-12-10 01:12:42 +01:00
Blood-Asp
8176a5fca9
cable burn fix and ihl compat fix
2015-12-08 23:39:41 +01:00
Blood-Asp
4fd0a7f473
Fix forestry compatibility and add luber ability to chainsaw
2015-11-28 20:35:20 +01:00
doushio9967
753de8ba94
Remove duplicate repair achievements, fix HV Pump achievement.
...
Previously any tier pump would trigger the slurp achievement.
No idea why repair was listed thrice.
2015-11-24 07:42:21 +01:00
Blood-Asp
0c9361193a
GT Bee fix + new crop textures.
2015-11-18 01:32:45 +01:00
Blood-Asp
29fade51aa
Forestry update + bee nerv
2015-10-29 00:37:04 +01:00
Shawn Buckley
123aa6ed28
Reformat code
2015-10-21 22:15:09 -04:00
Shawn Buckley
9353aa711b
Reformat code
2015-10-21 22:06:25 -04:00
Shawn Buckley
cda516a3e3
Update to Forestry 4
2015-10-21 21:30:33 -04:00
Shawn Buckley
c68e84f1e2
Remove jdgui-comments
2015-10-21 21:11:56 -04:00
Shawn Buckley
bea4cfc545
Bring in experimental branch
2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7
Move source files
2015-10-21 20:46:52 -04:00
Shawn Buckley
85c804fa11
Move source directory
2015-10-18 23:04:39 -04:00
