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

1666 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aidan
7ccff946c6 Merge pull request #1260 from Vexatos/patch-1 
Update de_DE.lang
 2014-03-26 09:16:01 -04:00
Aidan
42903c9dfe Merge pull request #1257 from markwhi/miner_chargepad_fixes 
DynamicNetwork capcity optimizations and two small bugfixes.
 2014-03-26 09:15:52 -04:00
Vexatos
e573b97913 Update de_DE.lang 2014-03-24 20:03: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
Aidan C. Brady
7398b21554 Loads of work on Seismic Vibrator 2014-03-15 20:05:26 -04:00
Aidan
a48fd10b2a Merge pull request #1197 from Vexatos/patch-1 
Update de_DE.lang and improved Filter Card localization
 2014-03-13 10:28:48 -04:00
Vexatos
9e4d347f8a Update en_US.lang 2014-03-12 17:34:17 +01:00
Vexatos
734f24d592 Update de_DE.lang 2014-03-12 17:33:50 +01:00
Vexatos
e9e0ae96a8 Update ItemFilterCard.java 2014-03-12 17:32:34 +01:00
Vexatos
8ddc6a9c37 Update de_DE.lang 2014-03-12 17:27:56 +01:00
Vexatos
9778404451 Update de_DE.lang 2014-03-12 17:22:35 +01:00
Aidan
d8ccb834f6 Merge pull request #1190 from tterrag1098/patch-4 
Safer onUpdate in ItemProxy, should fix #1187
 2014-03-10 19:10:45 -04:00
tterrag1098
0859b54a55 Safer onUpdate in ItemProxy, should fix #1187 2014-03-10 17:03:22 -04:00
Aidan C. Brady
653aa6c30f A few creative enhancements 2014-03-09 21:55:01 -04:00
Aidan C. Brady
1b051c0dec Fix a tiny bug 2014-03-09 18:55:03 -04:00
Aidan C. Brady
3fd2701524 Hopefully finish GUI stuff 2014-03-09 18:51:46 -04:00
Aidan C. Brady
5bccdb7c16 Fix dumb crash 2014-03-09 18:35:31 -04:00
Aidan C. Brady
fe1f33e161 Finished material filters 2014-03-09 18:33:21 -04:00
Aidan C. Brady
bb0ad74295 Work on sorter material filters 2014-03-09 18:23:06 -04:00
Aidan C. Brady
509d857576 Just about finished, onto sorters 2014-03-09 12:10:51 -04:00
Aidan C. Brady
850481bf3d Got the GUI working mostly 2014-03-09 11:56:08 -04:00
Aidan C. Brady
1b27b6a37b Work on Digital Miner material filters 2014-03-09 11:37:42 -04:00
Aidan C. Brady
1500bfe929 Filter Cards, all done 2014-03-08 17:47:39 -05:00
Aidan C. Brady
71c041917d Merge branch 'master' into development 2014-03-08 16:26:50 -05:00
Aidan C. Brady
4f69850f17 v6.0.4 release 2014-03-08 16:26:36 -05:00
Aidan C. Brady
11db9f265d Fix a bug with advanced electric machines 2014-03-08 12:01:45 -05:00
Aidan C. Brady
d553c4774e Fix a few annoying bugs 2014-03-08 11:51:13 -05:00
Aidan C. Brady
71e1e2c666 Fix key calls 2014-03-08 01:01:54 -05:00
Aidan C. Brady
1c42aebfec Several fixes 2014-03-07 22:00:35 -05:00
Aidan C. Brady
ac16039ecf Merge branch 'master' into development 
Conflicts:
	common/mekanism/client/render/MekanismRenderer.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/integration/OreDictManager.java
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/common/tile/TileEntitySalinationController.java
	common/mekanism/generators/common/MekanismGenerators.java
	common/mekanism/tools/common/MekanismTools.java
 2014-03-07 21:39:13 -05:00
Aidan C. Brady
f3ca4c5887 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/item/ItemAtomicDisassembler.java
 2014-03-07 21:37:30 -05:00