aidancbrady
fa7b9b49bc
Fix glow panel placement, fixed damage displays (again), start work on new inventory system
2017-03-28 23:21:06 -04:00
aidancbrady
89905c836b
Fix runtime texture errors, fixed JEI errors, fixed damage display, fixed naming
2017-03-28 22:04:33 -04:00
aidancbrady
c510ce7d8c
Merge branch '1.7.10' into 1.10
...
* 1.7.10:
Added version-based handling, bump version to 9.1.1
Bump up Dynamic Tank max storage, fixed Factory container issue
Add config option to disable block protections
Fixed chunk churning issue with frames
Restrict Thermal Evaporation Plant output to needed
Going back to MIT, thanks to the concerns of @bshelden and @asiekierka
Conflicts:
build.properties
src/main/java/mekanism/api/MekanismConfig.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/ThreadGetData.java
src/main/java/mekanism/common/block/BlockBounding.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/network/PacketConfigSync.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
src/main/java/mekanism/tools/common/MekanismTools.java
2016-11-27 13:33:57 -05:00
aidancbrady
1945ce44ee
Cache Formulaic Assemblicator recipes, make Energy Cube and Gas Tank side configuration consistent
2016-08-27 18:08:21 -04:00
Clienthax
03191f198b
Add config option to disable block protections
2016-08-15 02:58:15 +01:00
aidancbrady
38999f3647
Better Creative Energy Cube config
2016-07-28 12:36:15 -04:00
aidancbrady
7b48129909
Merge branch 'development' into 1.9.4
...
* development:
Add necessary networking to Reactor Port
Better tooltips
Actually fix tier installers
Add Silicon crusher recipe, fixed Tier Installers
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/MekanismItems.java
src/main/java/mekanism/common/item/ItemFactoryInstaller.java
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
src/main/java/mekanism/generators/common/block/BlockReactor.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady
52daff9f67
Better tooltips
2016-07-06 17:53:14 -04:00
aidancbrady
333cc7ff27
Completed Tesla support, using a handy new system of wrapper-abstracted item and tile capability handlers
2016-07-02 01:27:49 -04:00
aidancbrady
53353cd050
Fixed IC2 support (still may crash without), begin adding Tesla support
2016-07-01 11:05:02 -04:00
aidancbrady
1cc41c8722
Update IC2 API
2016-06-22 12:13:18 -04:00
aidancbrady
3983cc858b
Begin the great port. 2378 errors to go!
2016-05-24 20:04:40 -04:00
aidancbrady
be863a4289
Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound
2016-05-19 18:48:59 -04:00
aidancbrady
59eca85008
Complete merge, fixed third person perspective, add Digital Miner overlay, clean up Energy Cube tier management
2016-05-12 00:35:39 -04:00
aidancbrady
374cc57515
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
2016-05-10 22:24:37 -04:00
aidancbrady
b3b714cd36
Gas Tank and Fluid Tank state management & renders, along with tier colors. I'm getting the hang of this!
2016-05-05 15:25:09 -04:00
Ben Spiers
85c67666ad
Merge branch 'development' into 1.8.9
2016-05-01 23:57:29 +01:00
aidancbrady
4720e8f7af
Fixed Energy Cube crafting
2016-04-30 14:15:09 -04:00
aidancbrady
fe99d25305
Add network layer to make security preferences persistent
2016-04-30 11:26:12 -04:00
Ben Spiers
8064beb0fc
Fix compile errors from merge
2016-04-25 17:47:54 +01:00
Ben Spiers
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01:00
Ben Spiers
78c2afb5ea
Actually get it compiling again.
...
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
aidancbrady
67372d703e
Portable Teleporter remembers frequency, new side data functionality for blocks with non-configurable sides, fixed energy cubes not outputting up or down, fixed transmitter lighting
2016-03-31 20:17:00 -04:00
aidancbrady
5ed86f3f01
Extend security to generators, gas tanks and energy cubes
2016-03-21 23:14:38 -04: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
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