Commit Graph
44 Commits
Author SHA1 Message Date
Thiakil 86d232d9db add factories to jei catalysts if enabled 2018-05-05 20:15:01 +08:00
Xander 1415288bcf fix String#toLowerCase() calls to toLowerCase(Locale.ROOT). Fixes #4957 2018-03-24 17:09:44 +08:00
Joseph C. Sible b0bbf5cb68 Fix several type-safety issues 2017-09-23 22:21:28 -04:00
Tom Elfring babbe59cab Cleanup
Removed unused imports
Add/remove all methods used for arrays
Removed manual array copy
2017-08-05 18:12:45 +02:00
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring 6576335f44 Remove unnecessary modifiers and semicolons 2017-08-05 13:30:20 +02:00
aidancbrady f4570f61d2 Make factories respect machine energy usage, fixed creative gas tanks and fluid tanks integer overflow 2017-05-27 15:12:51 -07:00
aidancbrady 4cb866c622 Fixed Pressurized Tube crash 2017-04-14 09:13:32 -04:00
aidancbrady 2aad738c3d Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code 2017-03-28 22:49:29 -04:00
aidancbrady 2f705768e4 Work on overhaul of transmitters 2017-03-28 19:32:32 -04:00
aidancbrady 5a573b7d44 Creative Bins? Creative Bins. 2016-08-10 14:37:45 -04:00
aidancbrady ac4148c01b Creative Gas Tanks! 2016-08-07 20:40:28 -04:00
aidancbrady 3b07db3dc0 Fixed Mechanical Pipe crash, fixed Induction Cell issue, added Creative Fluid Tank and removed prefilled tanks 2016-08-07 19:58:45 -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 8b1017a3a8 Lots and lots of fancy rendering! 2016-05-11 17:42:51 -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 bebad0c15e Experimental new MCMultipart rewrite of transmitters.
Less changed code than expected! Nothing renders or works yet though.
2016-04-30 19:53:39 +01: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 38a68541c4 Tiered Bins, better tier management! 2016-03-16 21:41:55 -04: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 b3143d1abb Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system 2016-02-24 20:29:50 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
Ben Spiers dd99f582af State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
2016-01-27 01:36:39 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
aidancbrady f95bfbb600 Fix console spam, we don't really need that anyway 2015-05-28 10:32:05 -04: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 fe8cc9d1e0 Tiered Pressurized Tubes, better tooltips, better transmitter icons 2015-03-31 17:46:09 -04:00
Aidan C. Brady a5db67e2b7 Tiered Logistical Transporters 2015-03-31 11:39:10 -04:00
Aidan C. Brady 2d727b56ca Fixed some naming - factories now display their complete names 2015-03-26 10:17:06 -04: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
Aidan C. Brady 410e298b8e Scaled up Universal Cable throughput in preparation for reactor output rate, may need to further scale in the future 2015-02-27 18:28:21 -06: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 dde9b53447 Fixed the addition of the "creative control circuit" 2014-07-31 21:08:46 -04:00
Aidan Brady da35b509fd Creative Energy Cube now won't be drained of or receive power. 2014-07-31 19:19:03 -04:00
Ben Spiers 1d52a4f5a0 Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy. 2014-07-28 17:18:33 +01:00
Aidan C. Brady 9dc1c1d1c6 Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between. 2014-07-09 23:52:01 -04:00
Aidan C. Brady ee87d8cef5 Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
Aidan C. Brady b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02: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