Commit Graph
37 Commits
Author SHA1 Message Date
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 650b725567 Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators 2016-03-17 14:23:53 -04:00
aidancbrady 1eff6ad6b8 Ship with CoFH energy API (as well as a few item tidbits). It's about time 2016-03-06 12:42:04 -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
aidancbrady 668643e663 Entangloporters work perfectly! 2016-03-04 21:58:13 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers 8af7ec270a Fix item package 2016-01-25 00:54:05 +00:00
Ben Spiers 4ef5840ff9 stackTagCompound -> getTagCompound() 2016-01-23 14:15:58 +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 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
Aidan C. Brady 45895cb753 Configurable values for Mekanism tier-related properties 2015-04-01 11:06:27 -04:00
Aidan C. Brady 1c7f7a09ac Energy Cubes now use old localization standards 2015-03-29 11:01:54 -04:00
Aidan C. Brady 2d727b56ca Fixed some naming - factories now display their complete names 2015-03-26 10:17:06 -04:00
Ben Spiers 71a9bfc4f9 Make the @Optional removals stricter.
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00
Aidan C. Brady 420a04c361 Added recipes for Induction Casing and Induction Ports, better recipes for Dynamic Tank blocks, fixed a few other recipe bugs 2015-03-04 20:54:03 -05:00
Aidan C. Brady ce31b1e22c Start work on the Energized Induction Matrix. This is going to be fun! 2015-02-28 13:08:17 -06:00
Ben Spiers 1cfaec3692 Fix imports, key handler. 2014-09-14 05:18:35 +01:00
Ben Spiers 1ad8f62627 Merge branch 'development' into 1.8
Conflicts:
	build.properties
	src/main/java/mekanism/client/MekanismKeyHandler.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2014-09-14 01:36:11 +01:00
Ben Spiers 83d9ecaf23 Mouse button binding fixed
Also, make the extra info in tooltips use the sneak keybind.
2014-09-11 04:05:45 +01: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 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Aidan C. Brady d5508667f3 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/multipart/PartTransmitter.java
	src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
	src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
	src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
	src/main/java/mekanism/common/tile/TileEntityTeleporter.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
2014-08-07 23:02:11 -04:00
Aidan C. Brady 12ad58b1f9 Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method 2014-08-07 22:48:35 -04:00
Ben Spiers 2048083e11 Fix energy cubes not coming from NEI charged 2014-08-03 20:27:20 +01:00
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike.
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan Brady 6e975ee632 Made them really infinite 2014-07-31 19:29:49 -04:00
Ben Spiers cd10bc88c8 Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces. 2014-07-10 16:53:01 +01:00
Aidan C. Brady 63970a29ea Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01: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 d7fdc3a243 Greatly improved localization 2014-06-10 11:35:54 +02:00
Aidan C. Brady 8be5ecf140 Down to 215 errors, pretty much everything is packets now 2014-05-30 23:49:24 +02:00
Aidan C. Brady fa0c2e6f12 More bits of work 2014-05-30 23:10:05 +02:00
Aidan C. Brady d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +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