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

143 commits

Author SHA1 Message Date
Ben Spiers e05479a909 Update every applicable API, remove some unused imports 2013-09-30 22:37:16 +01:00
Ben Spiers 7f4a603f64 Update ic2 API. AGAIN 
Conflicts:
	common/mekanism/common/Mekanism.java
	common/mekanism/common/MekanismHooks.java
 2013-09-28 03:20:43 +01:00
Ben Spiers a4222a86f0 Update obf 
Conflicts:
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
 2013-09-28 03:06:41 +01:00
Ben Spiers c53be88a5f Fix a stupid bug. 2013-09-27 22:32:54 +01:00
Ben Spiers 53b659ca12 Merge pull request #264 from DarkGuardsman/master 
could be a fix to concur modification error
 2013-09-20 11:33:46 -07:00
micdoodle8 d70dbe431a Fix concurrent modification exception when unloading chunks. 2013-09-12 17:28:32 -04:00
DarkGuardsman b021cd6d3f could be a fix to concur modification error 
So far it looks like it is working but more research/testing needs to be
done.
 2013-09-09 02:04:56 -04:00
Calclavia fe0b7cd757 Added universal cable to ore dict for recipe 2013-09-07 23:21:25 +08:00
Aidan Brady 8509eaf0ad Fixed IC2 integration :) 2013-08-30 15:20:52 -04:00
Aidan Brady 92bee121b2 Update IC2 API 2013-08-29 18:57:13 -04:00
Aidan C. Brady a73bf9e9d4 Necessary null check 2013-08-29 13:03:32 -04:00
Ben Spiers 9755b47833 Universal cable support for accepting from UE machines. change *Network* to *TransmitterNetwork* in ITransmitter to avoid method name conflicts. 
Not all IConductor methods are properly implemented, doesn't seem to cause problems in my testing. Could probably implement IElectricityNetwork in EnergyNetwork but this seems to work.
 2013-08-27 00:18:12 +01:00
Aidan C. Brady 86b8499bb5 A bit more organizing, nothing API related 2013-08-26 18:57:08 -04:00
Aidan C. Brady 6af0b1abd7 Screw it, package organization (sorry, that's an API update) 2013-08-26 18:49:32 -04:00
Aidan C. Brady 13a47bbc96 Final changes in upgrade GUI modularization, will work on factory recipe type GUI modularization next 2013-08-26 18:28:55 -04:00
Aidan Brady 08fda4cdd5 Upgrade refactoring, CURRENTLY BROKEN 2013-08-25 20:54:34 -04:00
Aidan Brady 7f1b3d60f9 Tiny cleanup 2013-08-25 12:35:12 -04:00
Aidan Brady b540e95381 Fix Gas Tank crash 2013-08-25 12:29:30 -04:00
Aidan Brady 268a1eca6b Refresh UE API 2013-08-25 12:22:31 -04:00
Aidan Brady 13901f60b0 Bit of modularization 2013-08-25 12:17:56 -04:00
Aidan Brady 55fee96644 Updated IC2 API (again), added obsidian 200% ore-to-dust processing 2013-08-25 12:02:25 -04:00
Aidan Brady 9a6f4d6a0e Fix the crashes people are having with checkTransmissionType() 2013-08-25 11:24:07 -04:00
Calclavia 791c60fd77 Updated UE API 2013-08-25 21:37:11 +08:00
Calclavia e228e11031 Updated BuildCraft API 2013-08-25 21:36:29 +08:00
micdoodle8 9b356038f9 Fix pressurized tubes not connecting to gas transmitters in external mods. 2013-08-25 01:39:55 -04:00
micdoodle8 8e667efd7b Fix canTransferGas() 
Tested and working.
 2013-08-25 01:34:45 -04:00
Ben Spiers 0951acf142 Remove the old one. Forgot to save the file... 2013-08-25 02:47:16 +01:00
Ben Spiers 32c32fb106 Move checkTransmissionType to TransmissionType. 2013-08-25 02:41:03 +01:00
Ben Spiers d18c9645f9 Fix being able to move the electric chest into a different slot using number keys and crashing everything 2013-08-25 02:41:03 +01:00
Ben Spiers ecd9f29f07 Don't emit fluid from active pipes. 2013-08-25 02:41:03 +01:00
Aidan C. Brady 7a7b398f31 Several bugfixes, overhaul of TileEntity-based upgrade management 2013-08-24 21:22:45 -04:00
Ben Spiers 081e204dbf Pressurized tubes transfer gas 2013-08-23 19:43:10 +01:00
Ben Spiers 8f4b19f87c A slightly surprisingly large number of unused imports 2013-08-23 19:25:26 +01:00
Ben Spiers 6cf89af4b2 Generalise the EnergyMeter. The name may not be entirely accurate any more. 2013-08-23 19:23:08 +01:00
Ben Spiers 2045c26c7d UE update 2013-08-23 04:19:44 +01:00
Ben Spiers 65776e3516 Fix a bit of wonkiness with pipes, etc. 2013-08-23 04:19:01 +01:00
Ben Spiers 486e5aa334 Make dynamic tanks render gaseous fluids by transparency instead of level. 2013-08-22 23:55:06 +01:00
Ben Spiers f39e3a528d Fix chunk-load handler; make it refresh adjacent loaded chunks as well, to 
solve an edge case.
 2013-08-22 21:16:28 +01:00
Ben Spiers 67687cd579 I'm an idiot. 2013-08-22 21:16:27 +01:00
Aidan C. Brady 5e379f052a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/api/GasNetwork.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/TileEntityEnergyCube.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-22 14:07:28 -04:00
Aidan C. Brady 5072b20673 Updated IC2 API, modularized energy management 2013-08-22 11:36:31 -04:00
Ben Spiers d9c94cc0c8 Add missing import 2013-08-21 20:31:54 +01:00
Ben Spiers e598527656 Fix StackOverflowException on getNetwork. 2013-08-21 20:26:47 +01:00
Ben Spiers 19cea5b35c PowerReceiver can sometimes be null 2013-08-19 21:29:14 +01:00
Ben Spiers 18868398b4 Stop Object3D.getTileEntity() from loading unloaded chunks. 2013-08-19 18:37:36 +01:00
Aidan C. Brady 896daa10e8 Quick fix 2013-08-19 09:45:43 -04:00
Aidan C. Brady de10fa2d58 Finished new changes, canTransferGas() functionality temporarily severed 2013-08-19 07:55:47 -04:00
Aidan Brady 30f7bfa126 Loads of work on modularization, BROKEN BUILD 2013-08-18 21:32:47 -04:00
Aidan Brady 046cab7880 Base transmitter TileEntity class 2013-08-18 17:04:20 -04:00
Aidan Brady f64ea42e43 Even more modularization 2013-08-18 16:51:47 -04:00