Commit Graph
75 Commits
Author SHA1 Message Date
aidancbrady 7323a13e09 Support for custom localizations, closes #2626 2015-07-20 18:48:45 -07:00
aidancbrady 7799afed53 Go ahead and bump Forge to latest recommended, 1291 is looking too old 2015-07-14 14:22:27 -07:00
tterrag1098 b70c0e015f Remove hard dep on unnecessarily new forge version 2015-05-13 17:18:21 -04:00
aidancbrady 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
Ben Spiers e6ee804686 Update forge again. 2015-04-17 18:27:41 +01:00
Aidan C. Brady b055b116e5 Don't reset induction cell storage 2015-03-29 13:26:43 -04:00
Aidan C. Brady 61735a27aa Fixed Solar Neutron Activator not rendering in inventory, fixed Solar Neutron Activator replacing blocks 2015-03-29 10:49:28 -04:00
Aidan C. Brady 7afef3f8ee Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type 2015-03-26 17:10:32 -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 050f3351e2 Fix advanced-recipe factories not using gas at first 2015-03-22 13:07:25 +00:00
Ben Spiers 83e41478e5 Localisation, icon, fixes. 2015-03-21 19:13:15 +00: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 d1990c232d Finished off Oredictionificator 2015-03-16 11:43:28 -04:00
Aidan C. Brady 3f41027325 Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package 2015-03-07 21:08:28 -05:00
Aidan C. Brady d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
2015-03-07 19:09:23 -05:00
Aidan C. Brady af4c1c6cd7 A few fixes, need to fix an output issue 2015-03-04 13:04:32 -05:00
Aidan C. Brady 999502a053 Half-implemented Solar Neutron Activator 2015-02-25 11:11:30 -05:00
Aidan C. Brady 29e50a34fa Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2015-02-24 10:42:55 -05:00
Aidan C. Brady d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Aidan C. Brady 25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00: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 c7a429177b More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
Ben Spiers d78e16e954 Try and fix the mouse binding issue. 2014-09-03 19:51:50 +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
Ben Spiers 8f6b0ce6de Fix Portable tank fluid setting bug 2014-09-02 18:44:31 +01:00
Ben Spiers 05c7e63c55 Make shift not required to see contents of Portable Tanks.
For convenience of NEI searching.
2014-08-30 02:36:10 +01:00
Ben Spiers 0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Ben Spiers 1c71614c4a Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +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
Ben Spiers b62c5c8a3a Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one. 2014-07-30 22:26:03 +01:00
Aidan C. Brady ce5bddbdd1 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -04:00
Aidan C. Brady ab34edc46a Finished off new system of sustained data 2014-07-26 18:44:24 -04:00
Aidan C. Brady 94c3a6aa60 Started work on a new system of managing sustained data 2014-07-26 18:16:00 -04:00
Aidan C. Brady 7ac7fbc5cc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser 2014-07-26 17:59:43 -04:00
Aidan C. Brady ba289ced25 Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up 2014-07-26 17:37:25 -04:00
Aidan C. Brady aaffc3e364 Updated some imports and added textures 2014-07-26 16:45:48 -04:00
Aidan C. Brady 22b3097d15 Laser model! Also added some new Reactor Block assets. 2014-07-24 23:02:30 -04:00
Aidan C. Brady 52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady 99482d8fd0 Fixed a minor issue 2014-07-21 22:24:27 -04:00
Aidan C. Brady 076c5f7377 More work! 2014-07-21 21:21:53 -04:00
Aidan C. Brady fe177d20c7 Filter-based replacing works! Now to get the require system to work and the warning system set up. 2014-07-20 16:06:47 -04:00
Ben Spiers 4bea4c62fd Remove stray @Method
Should fix #1500
2014-07-13 05:06:57 +01:00
Aidan C. Brady 369eb012af Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash 2014-07-12 16:02:21 -04:00
Aidan C. Brady 65a8633441 Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules 2014-07-10 22:28:04 -04:00
Aidan C. Brady 7198704363 Fixed a crash! 2014-07-10 18:13:56 -04:00
Aidan C. Brady 1f9782d1c7 Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids 2014-07-10 16:24:55 -04:00