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

1149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan Brady efc98114e8 Core code for new energy framework. Still to do FluidNetwork and GasNetwork. 2013-12-13 23:42:27 -05:00
Aidan Brady 926cca0e0a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-13 23:17:16 -05:00
Aidan Brady ea57bb5990 Fix crash 2013-12-13 23:03:20 -05:00
Aidan 74a40ec1b9 Merge pull request #698 from Vexatos/patch-2 
Update de_DE.lang
 2013-12-13 15:29:56 -08:00
Aidan Brady 7555fbee7c Update UE 2013-12-13 17:15:53 -05:00
Aidan Brady a05870a2ef A few fixes 2013-12-13 17:13:46 -05:00
Vexatos fc0a611f93 Update de_DE.lang 2013-12-13 19:50:48 +01:00
Aidan Brady 0a0f3a1779 Minor cleanup 2013-12-13 07:02:13 -05:00
Aidan Brady 705b2b4528 Add TE support to Universal Cables, implemented Mechanical Pipe suck mode 2013-12-13 00:16:06 -05:00
Aidan Brady cb69ff842e Fix bounds on big transmitters 2013-12-13 00:01:54 -05:00
Aidan Brady c85bb7f9cc Add missing renderer 2013-12-12 23:36:55 -05:00
Aidan Brady 74d41073a6 Fixes, but getting an error for some reason 2013-12-12 23:08:16 -05:00
Aidan Brady a68468b82e Fix merge 2013-12-12 22:37:14 -05:00
Aidan Brady 11c7efd8fc Merge branch 'api-change' into multipart-experimental-new 2013-12-12 22:36:00 -05:00
Aidan Brady 0e35aca15a Rendering enhancements 2013-12-12 22:31:27 -05:00
Aidan Brady 6f99805443 Fix crash 2013-12-12 22:02:34 -05:00
Aidan Brady 4316103022 Fixes 2013-12-12 21:35:17 -05:00
Ben Spiers 55dd8f5bf9 Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor 2013-12-13 01:58:25 +00:00
Aidan Brady 2d5b633168 Work on stuff 2013-12-12 20:35:37 -05:00
Aidan Brady 11aa04a5df A few charging fixes 2013-12-12 19:46:23 -05:00
Aidan Brady 9ecb7c20fd More work on Infuser 2013-12-12 19:04:02 -05:00
Aidan Brady 43d3050b40 Work on Chemical Infuser 2013-12-12 18:33:56 -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
Ben Spiers 98c8068a0f Get Mechanical Pipe rendering working a bit better. 2013-12-12 20:23:03 +00: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
Ben Spiers c1318d998b Merge, hopefully without screwing too much up. 2013-12-12 01:56:05 +00:00
Aidan Brady faa127ddd8 Add textures for Sulfuric Gas & Sulfuric Acid 2013-12-11 20:46:39 -05:00
Aidan Brady 5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -05:00
Aidan Brady 6114463852 Work on TileEntity code of Chemical Formulator 2013-12-11 19:53:12 -05:00
Aidan Brady 7a3c678d76 Work on new machines 2013-12-11 18:26:10 -05:00
Aidan Brady 123ae05dcd Cleaned up contractor code 2013-12-11 18:10:01 -05:00
Aidan Brady 2d626f2279 Work on Chemical Infuser & Chemical Formulator recipe system 2013-12-11 17:08:15 -05:00
Aidan C. Brady 7e48fa2743 Work on container code 2013-12-11 16:34:54 -05:00
Aidan C. Brady a4e8158448 Add GUIs for T3 ore processing machinery 2013-12-10 18:51:16 -05:00
Aidan Brady 250ddadcf0 Dictionary! :) 2013-12-09 20:52:49 -05:00
Aidan Brady 3c4d776e24 Added lead ore processing 2013-12-09 18:30:50 -05:00
Aidan Brady add3cf0bf6 Bug fixes! 2013-12-09 17:54:59 -05:00
Aidan Brady ac31fc2b4e More work on networking system, unstable 2013-12-09 17:34:53 -05:00
Aidan Brady 26f0f83574 Work on initial data system for jetpacks/gasmasks 2013-12-09 17:08:47 -05:00
Aidan Brady 44a69da8a1 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-09 17:00:29 -05:00
Aidan Brady 7506b8fed8 Fix particles 2013-12-09 17:00:21 -05:00
Aidan C. Brady 54a10af2d7 A few tiny fixes 2013-12-09 17:00:08 -05:00
Aidan a1e1c06bcd Merge pull request #672 from Vexatos/patch-2 
Loads of work done. (Updated de_DE.lang)
 2013-12-09 12:54:38 -08:00
Vexatos 461e2886ab Typo fix. Let's hope is was a typo. 
Let's hope is was a typo.
 2013-12-09 19:23:03 +01:00
Vexatos 02fcac8967 Loads of work done. (Updated de_DE.lang) 
Yes, "Minierer" is a German word.
 2013-12-09 19:22:05 +01:00
Aidan C. Brady 5661b20b27 A few fixes 2013-12-09 11:56:48 -05:00
Aidan C. Brady 4035ba9b36 Add overlay for scuba tank 2013-12-09 09:52:49 -05:00
Aidan Brady 13b8c3f793 Fix MI config 2013-12-09 07:25:11 -05:00
Aidan Brady 4ebf11ed5a Fix crash 2013-12-09 07:19:16 -05:00