tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1700 commits 2 branches 0 tags 102 MiB
Commit graph

1204 commits

Author SHA1 Message Date
Ben Spiers 4b6cc394f5 Change some HDPE stuff. They don't need TileEntities or renderers any more but they use 4 ids now. I couldn't see any other way around. 2014-04-15 01:31:13 +01:00
Ben Spiers 8786b16b58 Merge branch 'development' into greylocke 
Conflicts:
	resources/assets/mekanism/lang/pl_PL.lang
 2014-04-14 17:11:48 +01:00
Ben Spiers 51c1bd4500 Merge branch 'master' into development 2014-04-14 17:07:36 +01:00
Ben Spiers 0ec86c5b9b Also recommit Coal Block changes. Same problem. 2014-04-14 17:02:43 +01:00
Ben Spiers 8fd3c628a0 Remove some unused imports 2014-04-14 16:44:01 +01:00
Ben Spiers bdefd61f44 Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. 2014-04-14 16:42:00 +01:00
Ben Spiers 61adaabec8 Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. 2014-04-14 16:41:35 +01:00
Ben Spiers 1a6030c1a5 Discover native block colouring support within normal block rendering code. 2014-04-13 23:40:51 +01:00
Ben Spiers 3dd06cca78 Glow panels. 2014-04-13 03:05:50 +01:00
Ben Spiers b3939c0b52 Update ComputerCraft API. No idea if I've implemented IPeripheral.equals() correctly, its documentation is not the most helpful. 2014-04-12 18:49:25 +01:00
Ben Spiers b5331b4141 Oops. 2014-04-12 18:45:02 +01:00
Ben Spiers aac74a100a Lots of GUI element work. Fixed Crystallizer typo. 2014-04-12 02:51:02 +01:00
Ben Spiers ffbd61d12c Remove IEnergySink from UniCables, it's not needed any more. 2014-04-11 21:12:54 +01:00
Ben Spiers 208e8fe277 Make universal cables pull from IC2 Sources when in PULL mode. 
This concludes work on making our IC2 support not suck.
 2014-04-11 21:12:45 +01:00
Ben Spiers e6bc2b4444 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. 2014-04-11 21:12:36 +01:00
Ben Spiers 5edf734292 Gui work 2014-04-11 21:10:14 +01:00
Ben Spiers 2b9c859618 Remove IEnergySink from UniCables, it's not needed any more. 2014-04-11 19:50:19 +01:00
Ben Spiers 28fd4b2f56 Add HDPE block recipes. 2014-04-11 18:22:25 +01:00
Ben Spiers 30c6a3b3b2 Work on localisations and Item rendering. 2014-04-11 03:32:52 +01:00
Ben Spiers 174167de57 Make universal cables pull from IC2 Sources when in PULL mode. 
This concludes work on making our IC2 support not suck.
 2014-04-11 03:32:17 +01:00
Ben Spiers 0dd1385702 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. 2014-04-10 23:50:16 +01:00
Ben Spiers d90648ace2 Fix ElectricBlocks not accepting from IC2. Stuff seems to come from UNKNOWN a lot... 2014-04-10 23:45:59 +01:00
Ben Spiers 04668a16a0 HDPE Blocks! 64 new cosmetic blocks for the low low price of just 4 new textures! 2014-04-10 03:05:28 +01:00
Ben Spiers 9e799ce603 Work on giving the PRC a GUI and adding in some missing textures (I don't usually do pixel art for a reason. This reason should be apparent). 2014-04-08 03:13:36 +01:00
Ben Spiers 6ef4b4b517 Access modifiers are generally advisable. 2014-04-08 03:03:43 +01:00
Ben Spiers e3496ea51f Merge branch 'development' into greylocke 2014-04-08 02:26:30 +01:00
Ben Spiers 1a111cc9dd Update FMP, allow sided hollow-cover behaviour. 2014-04-08 02:15:38 +01:00
Ben Spiers 8373b93dd3 More work on Guis and elements 2014-04-08 00:00:53 +01:00
Ben Spiers ffebfb0a9e More work on Gas gauge stuff 2014-04-07 03:28:05 +01:00
Ben Spiers 00388cb875 Start work on gas gauge gui element. Very rough so far. 2014-04-07 01:44:11 +01:00
Ben Spiers a15a408739 Start on GUI work for gas gen 2014-04-07 00:50:34 +01:00
Ben Spiers 50fa61e489 More work on fuel gas system and hydrogen generator 2014-04-07 00:07:59 +01:00
Ben Spiers 269dec46e7 Start generalising the hydrogen generator to burn other gases 2014-04-06 03:12:27 +01:00
Ben Spiers 57c08078f8 Get PRC functionality going. 2014-04-06 01:16:09 +01:00
Ben Spiers fef2d30194 Start work on Pressurised Reaction Chamber. 2014-04-04 02:34:33 +01:00
Ben Spiers d0c87e862a Even up hydrogen consumption and generation. 2014-04-04 01:01:54 +01:00
Ben Spiers 1298d544d5 Add tiers to Mechanical Pipe, primarily to allow pumping out greater volumes of fluid per connection, for mods that require massive amounts of fluid per tick, for example AS' turbines need ten buckets per tick to spin up. Also fix capacity updating. 2014-04-01 19:16:07 +01:00
Mark Whittington 0e19f8a213 Merge branch 'development' of github.com:markwhi/Mekanism into miner_chargepad_fixes 
Conflicts:
	common/mekanism/api/gas/GasNetwork.java
	common/mekanism/api/transmitters/DynamicNetwork.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/miner/ThreadMinerSearch.java
	common/mekanism/common/tile/TileEntityChargepad.java
 2014-03-24 02:06:23 -04:00
Mark Whittington 8c8d8b2bc2 Fix miner and chargepad bugs. 
Chargepad bug can cause server to crash.  Miner bug is minor (heh).
 2014-03-24 01:58:25 -04:00
Mark Whittington 05713b26ed DynamicNetwork and subclass capacity optimizations 
Store the network's capacity on the object rather than calculating it every
time it's requested.  Update the stored value when the network changes.
 2014-03-24 01:56:31 -04:00
Aidan C. Brady de81d57c96 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-03-22 12:24:15 -04:00
Aidan C. Brady ef558016a4 A few tiny fixes 2014-03-22 12:24:09 -04:00
Ben Spiers e564cdfa3c Fix the throughput reading on mechanical pipes. 2014-03-20 00:54:21 +00:00
Aidan C. Brady 00a54498dc Fixed Solar Generator generation 2014-03-18 17:18:54 -04:00
Aidan Brady b6fcba4b5c Fixed sorter halting 2014-03-16 15:16:13 -04:00
Aidan Brady f35f9650e3 Fixed the Chemical Crystalizer 2014-03-16 12:56:02 -04:00
Aidan C. Brady a1d91a3e26 Added a few missing recipes 2014-03-15 20:41:42 -04:00
Aidan C. Brady 92cfba7308 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-03-15 20:32:29 -04:00
Aidan C. Brady e77229817d Fix a few bugs 2014-03-15 20:31:31 -04:00
Aidan C. Brady 5172071a68 Polished off vibrator/reader 2014-03-15 20:21:36 -04:00