Commit Graph
69 Commits
Author SHA1 Message Date
Aidan C. Brady 75f09adba2 Seismic Vibrator model 2014-06-16 01:50:40 +02:00
Ben Spiers 2663be0f5a Allow Glow panels to be placed and stay in hollow covers again. 2014-06-15 20:26:47 +01:00
Aidan C. Brady 366a51e770 Crash fix! 2014-06-15 19:12:50 +02:00
Ben Spiers ac6ee8514f Quickly prevent NPEs in machines with empty tanks 2014-06-15 16:28:16 +01:00
Aidan C. Brady 982c7427f3 Fix cable dupe 2014-06-15 14:16:57 +02:00
Aidan C. Brady 4fdae8cbef Cherrypicked @dschub's vein fix - thanks! 2014-06-15 13:40:06 +02:00
Aidan C. Brady 90c1c690a9 Updated Cofh API 2014-06-15 13:35:51 +02:00
Aidan C. Brady 6cd3ae4fea Updated IC2 API, fixed paxels 2014-06-15 13:29:59 +02:00
Aidan C. Brady f2b914e216 Loads of GUI/NEI work. Tomorrow I need to get overlays to render on GuiElement slots 2014-06-15 02:22:55 +02:00
Aidan C. Brady 3a81058cbd Fix more transmitter render issues, also started on PRC NEI module 2014-06-14 19:31:24 +02:00
Aidan C. Brady 5c36612146 Updated NEI module to reflect new GUI changes, added PRC to RecipeHelper 2014-06-14 18:33:48 +02:00
Aidan C. Brady 3b99d376a4 Work on NEI module 2014-06-14 14:33:02 +02:00
Aidan C. Brady a40ab961c6 Added OreDict-based dye recipes, fixed MekanismTools item positioning 2014-06-14 14:16:33 +02:00
Aidan C. Brady 6ede9308e8 A few small fixes 2014-06-14 13:49:47 +02:00
Aidan C. Brady 9dea537010 Whoops - added indexed click impl 2014-06-14 10:30:58 +02:00
Aidan C. Brady 31dd643259 Add necessary GUI implementation for new mod ID filters 2014-06-14 10:26:12 +02:00
Aidan C. Brady 1a0821c727 Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow 2014-06-14 01:35:25 +02:00
Aidan C. Brady 70abe40b1f Mod ID filters :) 2014-06-13 20:58:50 +02:00
Aidan C. Brady 517c2a7655 Re-added NEI 2014-06-13 00:26:07 +02:00
Aidan C. Brady c8fb800c1a Updated localization yet again, fixed a small bug 2014-06-13 00:16:02 +02:00
Aidan C. Brady ef7f6e91eb Glow panels now break off of non-solid surfaces 2014-06-12 23:36:29 +02:00
Aidan C. Brady 81477966ee Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough) 2014-06-12 18:16:20 +02:00
Aidan C. Brady e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Aidan C. Brady be3883195c Glow panels render, but are really screwed up 2014-06-10 14:09:47 +02:00
Aidan C. Brady f3894f220c Added repair capabilities to armor and tools 2014-06-10 13:25:12 +02:00
Aidan C. Brady 3992a6ae46 Several more fixes! 2014-06-10 12:56:02 +02:00
Aidan C. Brady 49c7b1062a Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again 2014-06-10 12:49:49 +02:00
Aidan C. Brady 8685664d51 Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator 2014-06-10 12:24:44 +02:00
Aidan C. Brady d7fdc3a243 Greatly improved localization 2014-06-10 11:35:54 +02:00
Aidan C. Brady c875dab552 Updated recipes 2014-06-09 17:15:34 +02:00
Aidan C. Brady 7c7e5e23ee Update box blacklist to parse with block name instead of ID 2014-06-09 17:05:57 +02:00
Aidan C. Brady d6d7000eaf Update PacketPipeline to reflect new 6.0.5 transmitter packet changes 2014-06-09 16:52:29 +02:00
Aidan C. Brady dd83381774 Bug fixes! 2014-06-09 16:19:36 +02:00
Aidan C. Brady 726d9ebb0a Atomic Disassembler now can cut down trees with vein mode 2014-06-09 15:57:38 +02:00
Aidan C. Brady 4334690f78 Improved localization 2014-06-09 15:29:00 +02:00
Aidan C. Brady 75bd49de9d Buffed Salination Plant's water usage 2014-06-08 17:39:57 +02:00
Aidan C. Brady d436c70421 Merge branch 'master' into development
Conflicts:
	build.gradle
	build.properties
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/tools/common/MekanismTools.java
	etc/core/mcmod.info
	etc/generators/mcmod.info
	etc/tools/mcmod.info
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/PacketHandler.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
	src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2014-06-08 12:01:08 +02:00
Aidan C. Brady c72e1c6efc Work on transmitters 2014-06-08 01:17:47 +02:00
Aidan C. Brady b387c8529d Bumped version to 7.0.0, a few fixes and enhancements 2014-06-06 00:16:36 +02:00
Aidan C. Brady d1c3b3b8ef Manually merged riches' PR 2014-06-04 11:05:29 +02:00
Aidan C. Brady 1137b9514a Quick fix for Tellurium 2014-06-04 03:07:08 +02:00
Aidan C. Brady 91cd34b7d3 Harvest levels! Yeah! 2014-06-04 02:57:33 +02:00
Aidan C. Brady bda4f8cfe5 Fixed Walkie Talkies 2014-06-04 02:38:39 +02:00
Aidan C. Brady f0d3848f8a Sounds work! Also got tick handlers set up, still have to do a few things 2014-06-03 20:57:59 +02:00
Aidan C. Brady 815944c49a A major load of fixes - things should be about back to normal now. 2014-06-03 19:54:45 +02:00
Aidan C. Brady 322301c301 Added RecipeSorter registrations, fixed a few things 2014-06-03 11:25:12 +02:00
Aidan C. Brady b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady 5b611c9cdb 0 errors. This is it, the first building build of Mekanism for 1.7.2, and also the most buggy build of Mekanism to date most likely.
(I remembered to update the obfuscated reflections, so there's that)
2014-06-03 00:21:00 +02:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady 295efab7b2 More error fixes, down to 11! 2014-06-02 20:04:10 +02:00