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

134 commits

Author SHA1 Message Date
Aidan C. Brady 5c2c8e15cb Add in necessary models 2013-12-02 12:41:00 -05:00
Aidan C. Brady e38cf10ef6 Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism 2013-12-02 11:42:21 -05:00
Aidan C. Brady 20d3eb42b2 Add needed ingot recipes & textures 2013-12-02 09:24:52 -05:00
Calclavia 07332ca245 Merge branch 'master' into universal-wires 
Conflicts:
	common/mekanism/induction/common/MekanismInduction.java
	resources/assets/mekanism/lang/en_US.lang
 2013-12-02 19:47:38 +08:00
Aidan Brady e42ab62e2a Begin work on copper and tin ore and ingots :) 2013-12-01 21:58:35 -05:00
Aidan Brady 83bca26455 Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness 2013-12-01 17:45:19 -05:00
Aidan Brady 66cba8d50b Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 14:03:06 -05:00
Aidan Brady 7ebd132b6e Fixed teslas, merged Electrostatic Linker into Configurator 2013-12-01 14:03:00 -05:00
Vexatos aa4610330c Update de_DE.lang 2013-12-01 18:43:13 +01:00
Aidan Brady f55d3ac874 Added Factory input slot distribution, configurable voice ports, fixed several bugs 2013-12-01 12:38:34 -05:00
Calclavia c1d5e2bc60 Fixed non-multipart insulated wire texture 2013-12-01 18:05:27 +08:00
Calclavia 3cca65f2cd Fixed non-multipart wire textures 2013-12-01 17:02:39 +08:00
Vexatos 76b7ea116d Shorten the GUI stuff. I hope it is short enough for the GUIs 2013-12-01 09:08:11 +01:00
Calclavia a674e14851 Fixed wire texture not loading 2013-12-01 14:33:30 +08:00
Calclavia 10bbcff077 Fixed Multipart wires not loading 2013-12-01 14:30:54 +08:00
Calclavia 1aabe8f7b5 Added insulation texture 2013-12-01 14:11:14 +08:00
Calclavia 0205d7722e Readded universal wires into Mekanism Induction 2013-12-01 13:46:15 +08:00
Aidan Brady 0c618a1cf3 Localization & gas fixes 2013-11-30 11:31:18 -05:00
Vexatos e2a432fe11 Update de_DE.lang 2013-11-30 08:47:03 +01:00
Aidan Brady ba32a2b112 More localization support! 2013-11-30 00:43:54 -05:00
Aidan Brady b224a01f39 Work on localization support, move around some API classes to make better compatibility 2013-11-30 00:28:02 -05:00
Aidan Brady 00b4c6f3e3 Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
Aidan Brady ccae995242 Work on Rotary Condensentrator, fixed an issue with factories 2013-11-28 16:01:23 -05:00
Aidan Brady 98e864cd8d Work on that Rotary Condensentrator! 2013-11-27 23:42:54 -05:00
Aidan Brady 419a295096 Work on Rotary Condensentrator, fix IC2 energy integration (mostly) 2013-11-27 18:17:44 -05:00
Aidan Brady 22fe896bcd Finish multi-ID machine support 2013-11-27 16:17:10 -05:00
crafteverywhere 492e95a9c2 Update zh_CN.lang 2013-11-27 13:34:14 +08:00
Aidan Brady 6739d81a12 Miners are better for servers now. Please update! 2013-11-26 23:31:42 -05:00
Sakarias Longhorn e08b34395e French Translation 2013-11-27 00:52:47 +01:00
Vexatos f36fde885d Update de_DE.lang 2013-11-26 21:15:09 +01:00
Vexatos 08c8341eeb That'll work. 2013-11-26 21:12:14 +01:00
Aidan Brady c10ba92522 Connected Dynamic Glass textures :) 2013-11-24 19:30:52 -05:00
Aidan Brady 38d9bdd1d2 Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481) 2013-11-24 18:54:11 -05:00
Aidan C. Brady afae26f9b8 Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model. 2013-11-24 15:44:16 -06:00
Aidan C. Brady 59b945a33f Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup 2013-11-24 12:12:42 -06:00
Aidan C. Brady a27582971b Neatened up Diversion Transporter code 2013-11-23 15:01:18 -05:00
Aidan 5b690e9bfb Merge pull request #461 from pixlepix/master 
Logistical Diverter
 2013-11-23 11:44:03 -08:00
Aidan C. Brady 22c07254fd Purification, Compressing, and Combining factories :) 2013-11-23 14:36:50 -05:00
Aidan Brady 5465102329 Begin work on adding more recipe types to Factories. Don’t use this build! 2013-11-23 11:39:27 -05:00
Aidan Brady 4a5df9f922 Fixed tesla texture 2013-11-23 10:42:23 -05:00
pixlepix dc1743d517 Divertion transporter fixes, including name change 2013-11-23 07:28:01 -05:00
pixlepix 51225ba715 Logistical diverter texture 2013-11-23 07:28:01 -05:00
Aidan C. Brady 0adc0dc75e Attempt to use my own unit system 2013-11-22 20:58:49 -05:00
Aidan C. Brady a3d200291c GUI work... 2013-11-22 20:39:44 -05:00
Aidan C. Brady 649f128d76 Work on textures 2013-11-22 20:27:27 -05:00
Aidan Brady ace1365d0f Aw yeah! Better GUI packets for Miner. Heading to bed guys, see ya tomorrow! 2013-11-21 22:30:01 -05:00
Aidan Brady 0e2d2917d1 Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration 2013-11-21 21:37:03 -05:00
Aidan C. Brady 1c674f4317 Some bounding block inventory management 2013-11-21 16:04:14 -05:00
Aidan Brady 34f300cf6f Begin implementing that sexy model 
don’t recommend this build for personal use
 2013-11-20 20:28:06 -05:00
Aidan Brady 1f3a82c3f0 Miner work! Starting on actual operation algorithms. 2013-11-20 18:17:10 -05:00