Commit Graph
33 Commits
Author SHA1 Message Date
aidancbrady ddfe83c495 Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues 2016-05-09 21:07:18 -04:00
aidancbrady cfd66a0481 Fixed balloon hitbox 2016-05-06 00:01:34 -04:00
aidancbrady c29e4ab9bc Work on rendering- need to figure out why flamethrower sound is getting cut off 2016-05-05 21:01:10 -04:00
Ben Spiers 78c2afb5ea Actually get it compiling again.
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady 13996faacb Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded 2016-03-05 18:28:52 -05:00
aidancbrady 866c76bafe Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes 2016-03-05 13:17:58 -05:00
Ben Spiers 3126f144d2 API and other consistency fixes 2016-01-25 04:35:25 +00:00
Ben Spiers d4ca659ed0 More Client fixes 2016-01-22 00:20:29 +00:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady 42ce42aee2 Moved debug reference to MekanismAPI, fixed RC recipe 2015-06-15 12:39:48 -04:00
Aidan C. Brady 5a35d54a5c Flamethrower networking fixes 2015-03-20 13:06:19 -04:00
Aidan C. Brady 6d85b0800f Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP 2015-03-20 01:39:22 -04:00
Aidan C. Brady 50f7df5f98 Merge branch 'development' into v8
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Ben Spiers 1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers fab95e8900 Re-organise imports.
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Aidan Brady 285423d4b1 Merge branch 'development' into 1.8 2014-07-31 18:08:12 -04:00
Tonius fef1fb6fb6 Committed the other files I meant to commit. 2014-07-28 15:01:58 +02:00
Aidan C. Brady 69a411813e Started work on a Digital Miner visual render thing. For some reason it's culling all oceans. 2014-07-21 01:10:53 -04:00
Aidan C. Brady 7e525e10c6 Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -04:00
Aidan C. Brady 9469fcb51a Started work on actual flame implementation 2014-07-17 20:06:51 -04:00
Aidan C. Brady 9592d7f024 Flamethrower fixes! 2014-07-13 23:27:23 -04:00
Aidan C. Brady 1a458834a8 Work on making flamethrowers work nice. Still need to get first person neutral particles down. 2014-07-13 13:32:28 -04:00
Ben Spiers f0ad905c07 Merge branch '1.7.10' into development
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
2014-07-07 15:43:53 +01:00
Aidan C. Brady 7ca2090bc7 Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now."
This reverts commit 604f138f71.
2014-06-26 23:43:35 -04:00
Aidan C. Brady 604f138f71 Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now. 2014-06-26 23:40:02 -04:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Ben Spiers 3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00