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 3ed2d3ce6c Fixed render crash 2013-12-24 17:14:28 -05:00
Aidan Brady de3b0cb208 Fix factory injecting support 2013-12-24 17:06:35 -05:00
Aidan Brady fdc94550ee Fix a few bugs 2013-12-24 16:58:14 -05:00
Aidan Brady 3cea13a272 Hopefully fix JZ’s compile bug 2013-12-24 16:41:01 -05:00
Aidan Brady 7a71bc7848 Better holiday stuff 2013-12-24 16:06:57 -05:00
Aidan C. Brady d63628bebc Merge branch 'master' into development 
Conflicts:
	common/mekanism/client/ClientProxy.java
	common/mekanism/client/HolidayManager.java
	common/mekanism/client/sound/SoundHandler.java
	common/mekanism/client/sound/TileSound.java
 2013-12-24 14:44:17 -05:00
Aidan Brady 84f4eaee76 Christmas fun :) 2013-12-24 14:38:12 -05:00
Aidan Brady 8323ea6415 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-24 13:28:27 -05:00
Aidan Brady df95a64409 Finish merge 2013-12-24 13:28:20 -05:00
Aidan Brady fd26b9b11b Work on a little Christmas surprise 2013-12-24 13:25:31 -05:00
Aidan C. Brady 9498b01475 Finished off the Chemical Injection Chamber, just need sounds 2013-12-24 12:39:27 -05:00
Aidan C. Brady 4cf33562c6 Merge branch 'master' into development 2013-12-24 12:19:24 -05:00
Aidan C. Brady 9fbbc8381f Separated OreDict management from Mekanism, added proper recipes for Chemical Injection Chamber 2013-12-24 11:55:40 -05:00
Aidan C. Brady 1477b6ba7c Finished shard textures 2013-12-24 11:40:19 -05:00
Aidan C. Brady bd1e3234ff Fixed crash 2013-12-24 11:20:22 -05:00
Aidan C. Brady 4cfee657a0 Begin work on shard textures, still have a few to go 2013-12-24 11:17:52 -05:00
Aidan C. Brady a41760affd Chemical Injection Chamber initial work 2013-12-24 00:23:30 -05:00
Aidan C. Brady 9cc243a244 Properly use IFluidBlock.drain() when draining fluid blocks 2013-12-23 23:20:53 -05:00
Aidan C. Brady 9ed16f3006 A few fixes, please update! 2013-12-23 20:23:37 -05:00
Aidan C. Brady 52319ed31e A few fixes, please update! 2013-12-23 20:23:23 -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 824a3e0306 Merge pull request #739 from VeryBigBro/patch-1 
Update ru_RU.lang
 2013-12-22 20:25:13 -08:00
Aidan C. Brady b060c2c005 Fix silly upgrade GUI bug 2013-12-22 23:24:20 -05:00
Aidan C. Brady 6b420d07d2 Support for items/blocks with multiple OreDict entries 2013-12-22 18:28:49 -05:00
Aidan Brady d4fc39274e Threaded VoiceConnection, made client connection fire with server-configured port 2013-12-22 16:49:04 -05:00
Aidan C. Brady b73cf8f8ed Remove back crafting 2013-12-22 16:03:23 -05:00
Anton 5650ae38d1 Update ru_RU.lang 2013-12-22 14:39:34 +03:00
Aidan C. Brady 90985663bb Sync server configs with client 2013-12-22 01:49:55 -05:00
Aidan Brady ced44e97fc A few fixes, dynamic distance calculating as called by ILogisticalTransporter. Off to bed, more work tomorrow! 2013-12-22 01:21:40 -05:00
Aidan Brady 0f7e8eec31 A few fixes 2013-12-22 01:07:47 -05:00
Aidan Brady 87ce53f3fe Removed more UE stuff 2013-12-22 01:04:35 -05:00
Aidan Brady 3210153f38 Add delay to bin eject, removed old transmitters from creative tab, fixed descriptions of transmitters 2013-12-22 00:53:27 -05:00
Aidan Brady 4812b432fd A few fixes, added recipes for balloons 2013-12-22 00:42:46 -05:00
Aidan Brady 96fdb4d168 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-21 21:06:48 -05:00
Aidan Brady 6c87a8e288 Add Pos3D because vectors 2013-12-21 21:06:39 -05:00
Ben Spiers a70ce09442 Move Multipart initialisation to fix converter registration. 2013-12-22 01:43:18 +00:00
Aidan Brady 6cf6ba2b09 Transporters can now auto-pull items from adjacent sides, fixed recalculation logic with differing side types 2013-12-21 19:54:12 -05:00
Aidan Brady f25bc6f941 Fixed saving 2013-12-21 15:58:59 -05:00
Aidan Brady 198305ff39 Fixed transfer issue 2013-12-21 14:54:12 -05:00
Aidan Brady d6ad61114e Attempting to find an energy transfer issue 2013-12-21 14:27:35 -05:00
Aidan Brady 235c3f20a2 Killed off old UE references 2013-12-21 12:51:55 -05:00
Aidan c3f023c9e2 Merge pull request #736 from VeryBigBro/patch-1 
Update ru_RU.lang
 2013-12-21 09:23:08 -08:00
Aidan Brady 32a371c40d Fixed teleporters 2013-12-21 12:22:17 -05:00
Anton e163d5e6bd Update ru_RU.lang 
some work
 2013-12-21 19:54:29 +03:00
Aidan Brady bbbd5dea73 Fix some rendering bugs 2013-12-21 01:31:52 -05:00
Aidan Brady f2a3923c18 Got things working 2013-12-21 01:13:09 -05:00
Aidan Brady 5c3943bd5d More logic 2013-12-21 00:58:56 -05:00
Aidan Brady 516dfb9ffb Bits of work on transporter logic 2013-12-21 00:32:15 -05:00
Aidan Brady 15aa17e441 Connections complete, colors now update renderer properly 2013-12-20 21:34:16 -05:00
Aidan Brady d3661b3cd8 Got colors working, need to fix connections 2013-12-20 21:05:44 -05:00