Commit Graph
43 Commits
Author SHA1 Message Date
Aidan C. Brady c59b64f7c9 Merged changes 2015-02-19 09:15:00 -05:00
Aidan C. Brady d33af99b87 More cleanup 2015-02-16 18:11:45 -05:00
Aidan C. Brady 548145ae02 Revert "Revert "Fix some transmitter issues.""
This reverts commit e9ef6c1866.
2015-02-16 17:24:51 -05:00
Aidan C. Brady e9ef6c1866 Revert "Fix some transmitter issues."
This reverts commit f63807c75a.
2015-02-16 17:21:39 -05:00
Aidan C. Brady d8e12ca8d2 Merge branch 'development' into v8
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Ben Spiers f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers b5e289b504 Merge branch 'development' into v8 2014-12-16 20:35:55 +00:00
Ben Spiers 9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00
Ben Spiers 19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers 11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers c178f471f4 Cherry pick: Fix not sending tile updates
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
2014-09-07 00:26:03 +01:00
Ben Spiers fab95e8900 Re-organise imports.
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Ben Spiers 514b6962d2 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/tile/TileEntitySalinationController.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2014-08-28 22:18:31 +01:00
Ben Spiers e16a39912e Configurator Overhaul. Modes now more accurately descriptive.
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
2014-08-28 19:59:50 +01:00
Aidan C. Brady f87cc4a1e3 Logistical Transporter path caching.
I managed to take the average path calculation time down from 4-8 milliseconds to 100-200 microseconds. All in a day's work!
2014-08-21 20:46:51 -04:00
Aidan C. Brady 57452a562e Fixed a crash, also fixed the Logistical Transporter not connecting on chunk load.
I have absolutely no idea why, but for some reason calling isBlockProvidingIndirectPowerTo() before checking connections fixes the issue. Probably something related to chunk loading.
2014-08-18 16:10:44 -04:00
Aidan C. Brady 497af914dc Cleanup 2014-08-18 08:48:05 -04:00
Aidan C. Brady b657c0fb55 Fixed Diversion Transporter not rendering unlit redstone torch, forced Diversion Transporter to render center 2014-08-18 08:23:25 -04:00
Ben Spiers 8f9a2d31ee Overhaul transmitter rendering, to make everything look a little nicer. Turn-offable by config in case people prefer the "classic" look. 2014-08-15 03:27:04 +01:00
Ben Spiers 41e118ba2e Merge branch 'development' into 1.8 2014-08-14 23:37:28 +01:00
Ben Spiers 7813fad1ab Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused. 2014-08-14 23:30:27 +01:00
Ben Spiers e4c2692e64 Fix not sending tile updates 2014-08-14 23:05:32 +01:00
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Aidan C. Brady d4039d7f4b Fix the no-update issues 2014-08-08 22:09:14 -04:00
Aidan C. Brady ed919fa19a Fixed the no-update issues 2014-08-08 22:08:55 -04:00
Aidan C. Brady 76d2997a6b A quick fix 2014-08-08 15:09:42 -04:00
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike.
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Ben Spiers a2bb224bf5 Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop 2014-07-22 17:41:34 +01:00
Aidan C. Brady 7e525e10c6 Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -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 fd74ee5c92 Started work on Portable Tank 2014-06-18 03:01:23 +02:00
Aidan C. Brady 982c7427f3 Fix cable dupe 2014-06-15 14:16:57 +02:00
Aidan C. Brady 81477966ee Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough) 2014-06-12 18:16:20 +02:00
Aidan C. Brady c72e1c6efc Work on transmitters 2014-06-08 01:17:47 +02:00
Aidan C. Brady 295efab7b2 More error fixes, down to 11! 2014-06-02 20:04:10 +02:00
Aidan C. Brady 659b963af6 Alright, almost done with network changes (63 errors!) 2014-06-02 16:52:13 +02:00
Aidan C. Brady 6f69c6d7b4 Major 1.7 work, down to a little more than 500 errors 2014-05-29 17:55:47 +01: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