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

404 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan Brady
c27f4d06bc Git always finds a way to screw things up, re-added new transmitter renderer 2013-07-08 12:41:31 -04:00
Aidan Brady
ea9dcf73ec Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	resources/mods/mekanism/render/MechanicalPipe.png
	resources/mods/mekanism/render/MechanicalPipeActive.png
	resources/mods/mekanism/render/PressurizedTube.png
	resources/mods/mekanism/render/UniversalCable.png
 2013-07-08 12:15:07 -04:00
Aidan Brady
b313f0f96e Slightly better transmitter rendering, better energy cube outputting 2013-07-08 12:06:39 -04:00
Aidan
6fc93bb0fd Merge pull request #182 from unpairedbracket/transmitter-render 
Transmitter rendering improvements
 2013-07-08 09:04:02 -07:00
Ben Spiers
c6002cff51 Rewrite transmitter renderer to remove internal walls 2013-07-08 01:21:28 +01:00
Ben Spiers
39ab09bba8 Improve textures to remove inter-transmitter walls 2013-07-08 01:20:03 +01:00
Ben Spiers
0b786aa0b0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	common/mekanism/common/BlockEnergyCube.java
	common/mekanism/common/TileEntityEnergyCube.java
 2013-07-07 23:45:09 +01:00
Aidan Brady
1468fc05bd Fixed Universal Cable render 2013-07-07 13:22:24 -04:00
Aidan Brady
ce09a8225f Formatted EnergyMeter PR, merged Energy Cube comparator support 2013-07-07 13:07:40 -04:00
Aidan
3ea43f6f64 Merge pull request #179 from unpairedbracket/power-squashed 
Add Power Reading to EnergyMeter
 2013-07-07 09:58:31 -07:00
Aidan Brady
540823ef4a Removed Wind Turbine bound checking 2013-07-07 12:17:51 -04:00
Aidan Brady
bc4a34c189 Less client-based lag on machines and generators 2013-07-07 12:13:52 -04:00
Aidan Brady
37e442c17b Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs 2013-07-06 21:33:08 -04:00
Aidan Brady
0fb90be4c7 Crusher sound volume decreased, upgrades now sustained in recipes 2013-07-06 17:01:13 -04:00
Ben Spiers
6183761f68 Add an EnergyNetworkRegistry to keep track of Energy Networks and act as a singleton tick handler. 2013-07-06 03:14:33 +01:00
Ben Spiers
1241fa18a9 Refactor EnergyNetwork.split() to make sure lots of unneeded networks aren't created 2013-07-06 02:42:41 +01:00
Ben Spiers
b740f05079 Add power recording to networks and display to EnergyMeter 2013-07-05 18:39:54 +01:00
Ben Spiers
49fcac6d3c Use ElectricityDisplay for human-readable EnergyMeter units. 2013-07-05 17:52:47 +01:00
Aidan Brady
7df5888bd3 Added EnergyMeter 2013-07-02 19:03:03 -04:00
Aidan Brady
17d4acf389 Fixed IC2 integration, minor cleanup 2013-07-02 13:25:56 -04:00
Aidan Brady
29749ca510 Containers can now be accessed anywhere 2013-06-29 23:19:46 -04:00
Aidan Brady
52ceee1259 Mechanical Pipe crash fix, Dynamic Tank GUI fix 2013-06-29 23:06:24 -04:00
Aidan Brady
a667f9a3b6 v5.5.6 Beta #24 
*Removed Mechanical Pipe & Universal Cable redstone toggle.
*Fixed render crash.
*Fixed version println.
 2013-06-29 17:24:54 -04:00
Aidan Brady
8f6ad2688e General cleanup 2013-06-28 19:43:45 -04:00
Aidan Brady
645552e6fb Build fix no.5 2013-06-28 18:25:05 -04:00
Aidan Brady
51e91c3859 Build fix no.4 2013-06-28 18:22:41 -04:00
Aidan Brady
957d0577fb Build fix no.3 2013-06-28 18:11:34 -04:00
Aidan Brady
547563ed39 Build fix no.2 2013-06-28 18:10:10 -04:00
Aidan Brady
31fb314837 Fix build.xml 2013-06-28 18:03:47 -04:00
Aidan Brady
b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
Aidan Brady
612d4ab5cb Minor enhancements 
*Touched up on @micdoodle8's work on the GasNetwork.
*Pressurized Tubes now connect visually to Gas Tanks.
*Fixed various network crashes.
 2013-06-28 10:29:34 -04:00
micdoodle8
60932026af Check if tubes can connect to each other and merge/split accordingly 2013-06-28 00:44:14 -04:00
micdoodle8
339ed31326 Test if tube can transfer gas to other tubes before adding them to the list of attached tubes. 2013-06-27 15:05:56 -04:00
Aidan Brady
63db62654a v5.5.6 Beta #23 
*Configuration for machine energy usage.
*Bumped default Theoretical Elementizer energy usage.
*Cleaned up code.
*Fixed UnsupportedOperationException in EnergyNetwork.
 2013-06-27 11:03:50 -04:00
Aidan Brady
d94296631c v5.5.6 Beta #22 
*Updated textures.
*Revamped Gas/Liquid networks. *MDK UPDATE*
*Fixed redstone trigger on transmitters.
*Better cable connections.
*Liquid now renders with proper ItemStack-based color.
*Liquid now renders with flowing texture when in valve form.
 2013-06-26 17:49:47 -04:00
Aidan Brady
0969a06dba v5.5.6 Beta #21 
*Liquid now renders with Item-based color.
*Better IC2/TE recipe integration.
*Cleanups.
 2013-06-25 12:28:40 -04:00
Ben Spiers
3e79a32806 Add comparator support to Energy Cubes 2013-06-25 01:55:03 +01:00
Aidan Brady
e1c600dab3 v5.5.6 Beta #20 
*Fixed cape crash.
*Fixed several energy transmission bugs.
*Refactored energy network system, much more efficient.
*No more energy transmission packets.
*Fixed glitchy transmitter bounds.
*Fixed enrichment chamber able to crush ingots.
*Better javadocs.
*Updated UE API.
 2013-06-24 12:24:04 -04:00
Aidan Brady
e6c630a125 Quickfix for UC rendering 2013-06-21 11:48:47 -04:00
Aidan Brady
8d618e7285 Donator capes, configurable Universal Cable rendering 2013-06-21 11:47:01 -04:00
Aidan Brady
1b592c851a v5.5.6 Beta #19 
*Power Provider is configured whether BC is installed or not, should
fix issues with TE.
*Fixed incorrect powerRequest() for Universal Cables.
*Universal Cables & Pressurized Tubes now render with transparency
instead of differing height.
 2013-06-20 12:29:39 -04:00
Aidan Brady
a51050e30f v5.5.6 Beta #18 
*Robit GUI closes when "go home" called.
*Refactor multiblock inventory system to use only 1 map.
*Better-balanced recipes.
*Metallurgic Infuser now has a purple side by default.
*Configurable generation for MekanismGenerators.
*isAirBlock() instead of explicit id == 0 check.
*doubles instead of ints.
 2013-06-19 14:11:29 -04:00
Aidan Brady
b80172da4c Fixed IC2 electric item integration 2013-06-15 11:35:14 -04:00
Aidan Brady
401769d3c3 Javadocs, fixed Energy Cube recipes 2013-06-15 11:05:14 -04:00
Aidan Brady
4db1b5cfd7 v5.5.6 Beta #17 
*Using Object3D instead of Vector3.
*Don't use constructors for Mekanism packets.
*setParams() in IMekanismPacket for setting data.
*Began adding new javadocs.
 2013-06-14 18:25:09 -04:00
Aidan Brady
09e2be5833 Shorter packet channel, Robit packets now work 2013-06-13 21:45:29 -04:00
Aidan Brady
1b1853c8f6 Post-action cleanup, fix the NEI crash 2013-06-13 21:37:26 -04:00
Aidan Brady
fd556d14b1 v5.5.6 Beta #16 
*Updated to Forge 735.
*Updated GalactiCraft API.
*Updated IC2 API.
*Re-added Electrolytic Separator particle effects.
*Minor cleanups.
*Completely redesigned packet system from the ground up.
 2013-06-13 17:37:30 -04:00
Aidan Brady
3f87aa102e ClassNotFoundException temporary fix 2013-06-07 14:40:27 -04:00
Aidan Brady
29240c65fe Updated Metallurgy 3 API 2013-06-07 11:43:40 -04:00