aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
AgeCommit message (Collapse)Author
2016-09-24fix orehiding hiding all ores instead of only the unneeded.Blood-Asp
2016-09-20Merge pull request #632 from Muramasa-/BugfixesMuramasa-
Various Bugfixes
2016-09-17That didn't workMuramasa
2016-09-16Reduce Marble/Basalt harvest level and setOreBlock fixesMuramasa
2016-09-16One more conflictMuramasa
2016-09-16Fix conflictsMuramasa
2016-09-15Fix Tools and lag on reading tooltipBlood-Asp
2016-09-15Update Part 1Muramasa
2016-09-13Merge pull request #631 from Muramasa-/LoadTimesMuramasa-
Various Load Time Improvements
2016-08-25tmp fix for #595Blood-Asp
2016-08-14Bugfixes 6 fix: Removed commented codeMuramasa
2016-08-14Bugfixes 6Muramasa
2016-08-14Bugfixes 5Muramasa
2016-08-13TryCatch changesMuramasa
2016-08-13Remove null checksMuramasa
2016-08-13HashMap > ConcurrentHashMap & String varsMuramasa
2016-08-13Rest of d2a098fMuramasa
2016-08-13Worldgen and Random changesMuramasa
2016-08-10GT_Block_Ores_GC Null checkMuramasa
2016-08-10GC Ore SupportMuramasa
2016-07-27Merge pull request #583 from Muramasa-/FixesBlood-Asp
Remove UBC Dependency
2016-07-27Use GameRegistryMuramasa
2016-07-27Remove UBC DependencyMuramasa
2016-07-26Merge branch 'experimental' into NewFeaturesOneEyeMaker
2016-07-26Coils should be deprecatedOneEyeMaker
2016-07-25Method simplificationMuramasa
Simplified some methods. Fixed incorrect honey requirement for scanning forestry species. Tweaked a tooltips.
2016-07-25Changed method of "repairing" of overheated coils.OneEyeMaker
Also moved initialization of SubTags to prevent NoClassDefFoundException.
2016-07-23Fix "stone" veinsMuramasa
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-22Fix convertOreMuramasa
2016-07-22Fix harvest levelMuramasa
2016-07-22Various fixes/cleanupMuramasa
Game will no longer crash without UBC loaded Added missing mallet textures to materialicon Lignite
2016-07-21Ore System Rewrite part 2Muramasa
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-21Redefined some wires. Added last heating coil block.OneEyeMaker
2016-07-20Added new tier of heating coils.OneEyeMaker
//TODO: Find material for LuV coils.
2016-07-18Ore system rewriteMuramasa
2016-07-18Restored broken compatibility.OneEyeMaker
2016-07-18Moved all coils to another block.OneEyeMaker
2016-07-18Preparations for moving all heating coils to another block.OneEyeMaker
2016-07-17Added new heating coil blocks.OneEyeMaker
2016-07-16InitialMuramasa
This is more of a test and resource for when I eventually rewrite the GT5U ore texture/metadata system.
2016-06-23Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block ↵Blood-Asp
fuel values
2016-06-21Bug fixes for my commitsMuramasa
Removed commented out old turbine texture code Fixed Diesel Engine "Fuel Value" unit to EU/L Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes. Forgot to add recipe for Engine Intake. Redone the Gas/HPSteam turbine recipes. Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but not enough for the engine to run Updated Engine GUI
2016-06-19Changed Bittle charcoal tool back to axeBlood-Asp
2016-06-19Merge pull request #500 from Muramasa-/DieselGeneratorBlood-Asp
Large Diesel Generator
2016-05-26Fixed incomplete redo of brittle charcoal adventure fixMauveCloud
(had reverted after improper testing with axe instead of shovel, then neglected to check rebuilding with gradle after re-implementing fix in source)
2016-05-26Reinforced Block and Brittle Charcoal fixesMauveCloud
Added fixes for #503 and #436
2016-05-20Basically a rewriteMuramasa
2016-04-28Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into ↵MauveCloud
experimental
2016-04-28Improved brittle charcoal handling.MauveCloud
2016-04-19Main CommitMuramasa