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

44 commits

Author SHA1 Message Date
Ben Spiers
be15bab0b7 More Reactor work. Making way for persistent reactor state and guis and stuff. 2014-07-18 02:29:19 +01:00
Aidan C. Brady
c9f569fd4a Merge branch 'development' into 1.8 2014-07-17 01:44:54 -04:00
Aidan C. Brady
0a1afbae93 Fixed a major issue that was causing transmitter networks to be ticked twice in a single tick 2014-07-17 01:44:32 -04:00
Ben Spiers
bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Ben Spiers
cb2188580e More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary. 2014-07-16 02:54:13 +01:00
Aidan C. Brady
ddb6140513 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-13 23:27:28 -04:00
Aidan C. Brady
9592d7f024 Flamethrower fixes! 2014-07-13 23:27:23 -04:00
Ben Spiers
11e21e1957 Start on implementation of lasers. 2014-07-14 01:34:26 +01:00
Ben Spiers
700cc76c35 Fix a different, unrelated OreDict issue. 2014-07-13 19:58:00 +01:00
Ben Spiers
c560bdc2e1 Fix a different, unrelated OreDict issue. 2014-07-13 19:53:41 +01:00
Aidan C. Brady
1a458834a8 Work on making flamethrowers work nice. Still need to get first person neutral particles down. 2014-07-13 13:32:28 -04:00
Ben Spiers
0638cdb61c More work on Fusion Reactor and Lasers 2014-07-13 02:46:47 +01:00
Ben Spiers
a643f1c35c Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. 2014-07-10 19:24:33 +01:00
Ben Spiers
55b178b907 Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance." 
This reverts commit 7394ceda8f.
 2014-07-10 19:22:54 +01:00
Ben Spiers
7394ceda8f Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. 2014-07-10 16:53:01 +01:00
Aidan C. Brady
63970a29ea Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
Aidan C. Brady
377fff30ca We don't really need getLocation(), instead using Coord4D.get() with the getTile() method. 2014-07-09 15:37:43 -04:00
Aidan C. Brady
ee87d8cef5 Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
Aidan C. Brady
f405a9e2f0 Fixed transmitter recipes to more reasonable options. 2014-07-09 02:15:28 -04:00
Ben Spiers
611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Ben Spiers
9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Aidan C. Brady
99c1f44db5 Fixed refs to refresh() method 2014-06-19 15:18:41 +02:00
Aidan C. Brady
27295670cc Whoops - fixed crash. Also added recipe for Plenisher. 2014-06-19 14:42:11 +02:00
Aidan C. Brady
d9658a16bd Transmitter network efficiency overhaul! Transmitter networks now only refresh acceptors on the transmitter that initiated the refresh instead of resetting the entire grid. 2014-06-19 14:34:57 +02:00
Aidan C. Brady
7924531a4e Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI 2014-06-19 01:13:23 +02:00
Aidan C. Brady
fd74ee5c92 Started work on Portable Tank 2014-06-18 03:01:23 +02:00
Aidan C. Brady
ead4af2f78 Fixed transporter item rendering, fixed WAILA display bug. Dispensers now eject balloon entities! 2014-06-17 18:21:59 +02:00
Aidan C. Brady
3a81058cbd Fix more transmitter render issues, also started on PRC NEI module 2014-06-14 19:31:24 +02:00
Aidan C. Brady
5c36612146 Updated NEI module to reflect new GUI changes, added PRC to RecipeHelper 2014-06-14 18:33:48 +02:00
Aidan C. Brady
a40ab961c6 Added OreDict-based dye recipes, fixed MekanismTools item positioning 2014-06-14 14:16:33 +02:00
Aidan C. Brady
e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Aidan C. Brady
f3894f220c Added repair capabilities to armor and tools 2014-06-10 13:25:12 +02:00
Aidan C. Brady
49c7b1062a Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again 2014-06-10 12:49:49 +02:00
Aidan C. Brady
8685664d51 Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator 2014-06-10 12:24:44 +02:00
Aidan C. Brady
d436c70421 Merge branch 'master' into development 
Conflicts:
	build.gradle
	build.properties
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/tools/common/MekanismTools.java
	etc/core/mcmod.info
	etc/generators/mcmod.info
	etc/tools/mcmod.info
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/PacketHandler.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
	src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-06-08 12:01:08 +02:00
Aidan C. Brady
b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady
1933723b52 Major packet work, I think it's done. 34 errors to go! 2014-06-02 17:33:19 +02:00
Aidan C. Brady
ec2040cccc Work on networking update 2014-06-01 17:42:23 +02:00
Aidan C. Brady
d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
tterrag1098
6ac750520c Blocks and Entities 2014-05-06 03:14:44 -04:00
tterrag1098
321fa4ed50 Some work on GUIs, mostly sfx 2014-05-06 02:57:39 -04:00
Ben Spiers
31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers
db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things. 
1792 errors. A good night's work, I think.
 2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update. 
3797 errors. We have a long way to go.
 2014-04-20 03:44:06 +01:00