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

146 commits

Author SHA1 Message Date
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
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
d0c87e862a Even up hydrogen consumption and generation. 2014-04-04 01:01:54 +01:00
Aidan C. Brady
00a54498dc Fixed Solar Generator generation 2014-03-18 17:18:54 -04: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
Victor Robertson
e5a6eadc45 Fix indentation and remove trailing whitespace 
This patch provides common/mekanism/*.java with standardized
indentation (tabs) and also removes trailing whitespace.
 2014-03-07 19:20:35 -06:00
Aidan C. Brady
8b70e0d50d v6.0.4 push 2014-03-07 10:46:43 -05:00
Aidan Brady
8070b3ebd7 Bump version to 6.0.3 2014-03-01 11:12:04 -05:00
Aidan Brady
699749312c Made generators solid 2014-03-01 10:59:54 -05:00
Aidan Brady
84d300993b Fix a teleporter issue, bump version number to 6.0.2 2014-02-22 13:58:35 -05:00
Aidan C. Brady
95698e45ea Kill off old induction stuff, bump version to 6.0.1 2014-02-16 23:50:56 -05:00
Aidan C. Brady
cf73d1f2c0 A few tiny fixes 2014-02-12 19:05:43 -05:00
Aidan Brady
b821be5417 General enhancements 2014-02-05 20:22:43 -05:00
Aidan Brady
6e210f0730 Model positioning 2014-02-05 19:26:57 -05:00
Aidan C. Brady
2e325a0d31 Start on new Advanced Solar Generator model 2014-02-05 13:39:24 -05:00
Aidan C. Brady
0314b11edb Hopefully fix some things 2014-01-17 20:38:05 -05:00
Aidan C. Brady
9b7abb8d96 Added null check 2014-01-17 11:18:04 -05:00
Aidan Brady
44ae2e8606 Added null check for Vaygrim 2014-01-16 21:41:14 -05:00
Aidan C. Brady
da8a1a78db Fixes! :) 2014-01-14 22:31:59 -05:00
Aidan C. Brady
e726e5039e Work on Salination Plants 2014-01-14 16:19:21 -05:00
Ben Spiers
ce7fbaaeb0 Remove a loop in the solar generator code that was causing a big performance hit. As far as I can tell all it did was disable it if there were other solars above. By all means put it back if it was more important than that. 2014-01-11 02:53:09 +00:00
Aidan C. Brady
0b98b085d3 Add fancy energy info tabs, fix a few things, bump up both energy usage and generation on some machines/generators 2014-01-10 17:42:53 -05:00
Aidan Brady
4ab61c856f Organized some classes, began work on balloon entity connections 2014-01-07 20:55:50 -05:00
Ben Spiers
ab26ba5b73 More avoidance of crashing due to separator changes. 2014-01-05 20:22:06 +00:00
Aidan Brady
1835f6ff91 Update TE, add module config syncing 2014-01-03 14:26:41 -05:00
Aidan Brady
26f8aef381 Add check for old separators, add colorblind support to Logistical Transporter 2014-01-02 22:11:40 -05:00
Ben Spiers
f84bc43be1 Move separator into mek core, let IDEA optimise imports. Hope I didn't screw anything up too badly. 2014-01-03 02:09:21 +00:00
Ben Spiers
87a95e0732 Add Chlorine, do more E. Separator work, including temporary lava/brine substitute. I think it's pretty much finished for now, though maybe it could do with a new model. 2014-01-03 00:28:34 +00:00
Ben Spiers
ea96a7d747 Start work on updating the electrolytic separator. It can output both gases now! Should support recipes as well. 2014-01-03 00:28:34 +00:00
Aidan C. Brady
4210d15f1a Fixed connections to machines 2013-12-27 22:34:05 -05:00
Aidan C. Brady
6923d89fd1 Fix BioGenerator render texture 2013-12-27 22:20:27 -05:00
Aidan C. Brady
7010f03b65 Fixed a container bug that could have been driving some people nuts 2013-12-25 00:50:23 -05:00
Aidan C. Brady
583ef4fc19 More efficient redstone control 2013-12-25 00:03:04 -05:00
Aidan C. Brady
6df7544540 Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs. 2013-12-23 17:06:22 -05:00
Aidan Brady
235c3f20a2 Killed off old UE references 2013-12-21 12:51:55 -05:00
Aidan Brady
40e2d3b7fc Bump version, work on multipart transporters 2013-12-20 16:47:09 -05:00
Aidan C. Brady
0ab803feeb Rename Object3D to Coord4D, work on balloons 2013-12-20 16:09:09 -05:00
Aidan C. Brady
8edd4fcfa7 Work on Chemical Infuser/Formulator official implementation (without models yet) 2013-12-14 22:29:25 -05:00
Aidan Brady
74d41073a6 Fixes, but getting an error for some reason 2013-12-12 23:08:16 -05:00
Aidan Brady
11c7efd8fc Merge branch 'api-change' into multipart-experimental-new 2013-12-12 22:36:00 -05:00
Aidan C. Brady
338da4d92c Work on a more intuitive form of accepting gas in items and blocks 2013-12-12 16:54:55 -05:00
Aidan C. Brady
85a2c981df Fixed Adv Solar Generator config 2013-12-12 13:56:00 -05:00
Aidan Brady
31f8566a1f Merge branch 'master' into multipart-experimental-new 
Conflicts:
	common/mekanism/common/Mekanism.java
 2013-12-12 08:43:21 -05:00
Aidan Brady
eb8e02a39a Fix a few bugs! 2013-12-08 12:39:26 -05:00