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

3304 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan Brady
768f76e364 Fixed Robit crashing, added EnergyMeter recipe to master 2013-08-01 01:01:39 -04:00
Aidan Brady
ec42d430df Fixed Forestry integration 2013-08-01 00:50:18 -04:00
Aidan Brady
333896bcac Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/ModelBoxSelectiveFace.java
	common/mekanism/client/ModelRendererSelectiveFace.java
 2013-08-01 00:08:45 -04:00
Aidan Brady
d56eed2204 Cleanups! 2013-07-31 23:54:08 -04:00
Ben Spiers
260b9ed62f Stop the new renderer from just creating infinite new displaylists. 2013-08-01 03:14:57 +01:00
Aidan Brady
7bbcc1c178 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-31 21:20:50 -04:00
Aidan Brady
4c50c442d1 Better BC item integration, javadocs, cleanup 2013-07-31 21:20:12 -04:00
Ben Spiers
415360a293 Fix factory guis 2013-08-01 00:04:00 +01:00
Ben Spiers
1b64d077e4 @Aidancbrady, why did osmium armour think it's made of diamond? I've 
changed it because it was messing with the textures.
 2013-07-31 23:34:39 +01:00
Ben Spiers
7c71adc9d2 Well, I don't know why the old way was broken but it's fixed now. 2013-07-31 23:34:39 +01:00
Ben Spiers
423db88959 Transmitter rendering improvements. 
Now uses a new, slightly modified ModelRenderer and ModelBox I adapted
to be able to selectively render faces. Also we can now turn off back-face
culling without any xyz-fighting.
 2013-07-31 23:34:38 +01:00
Aidan Brady
0b5d188cd7 More ratio fixes, Electric Chest GUI now has energy tooltip 2013-07-31 17:00:30 -04:00
Aidan Brady
fc964ad8db Cleanups, fixed UE ratios 2013-07-31 16:44:53 -04:00
Aidan Brady
1953e16b5a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/TileEntityUniversalCable.java
 2013-07-31 11:59:49 -04:00
Aidan Brady
c389f5bd34 Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
Ben Spiers
248a976593 Possible hotfix for optifine crash 2013-07-31 03:31:37 +01:00
Calclavia
5f27a06983 Merge pull request #203 from ruifung/patch-1 
Update README.md
 2013-07-30 05:19:37 -07:00
ruifung
04a3d0f505 Update README.md 
You forgot to update README.md to say Minecraft 1.6.2
 2013-07-30 13:06:45 +08:00
Ben Spiers
60d9ac6d01 Oops. 2013-07-29 23:17:52 +01:00
Ben Spiers
b3909b7e6e Add debug info to EnergyMeter 2013-07-29 22:52:31 +01:00
Ben Spiers
30ca7d82d6 Add ability to manually force-fix a network using a configurator 2013-07-29 22:48:12 +01:00
Ben Spiers
b01cf3b8f7 Make it so that /mk is always available in SSP 2013-07-29 21:38:10 +01:00
Ben Spiers
18519b5fa6 Fix the EnergyNetwork memory leak. 2013-07-29 21:30:43 +01:00
Ben Spiers
c2c031ef2a Clean up a bit of unnecessary logic 2013-07-29 21:06:01 +01:00
Ben Spiers
735b281341 Fix a little derp in getPower() 2013-07-29 21:03:31 +01:00
Ben Spiers
6a562117b6 Fix ArrayIndexOutOfBoundsException in Electric Chest when attached to AE import buses and presumably other things. 2013-07-29 21:02:36 +01:00
Ben Spiers
0188882688 Fix the Electric Pump's render texture 2013-07-29 21:00:51 +01:00
Aidan
3cd0106c6f Welcome to the team, @unpairedbracket! 2013-07-27 21:58:40 -04:00
Aidan Brady
db5588ddb9 Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
Aidan Brady
aa3dcd0262 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-27 12:01:16 -04:00
Aidan Brady
dedb2ebdcf Fixed ControlCircuit recipe bug 2013-07-27 12:01:08 -04:00
Calclavia
0ea223fbcb Update build.xml 2013-07-27 11:40:16 -04:00
Calclavia
fdb05ab9eb Merge pull request #198 from calclavia/patch-1 
Fixes Mekanism causing constant broken builds
 2013-07-27 08:34:54 -07:00
Calclavia
73bda3e873 Fixes Mekanism causing constant broken builds 2013-07-27 11:24:21 -04:00
Aidan Brady
db8725e1a4 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-26 18:16:28 -04:00
Aidan Brady
5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
Ben Spiers
734835e695 Hopefully prevent potential (race condition?) NPE in osmium compressor. 2013-07-24 21:05:41 +01:00
Aidan Brady
13400fdc3d Bumped version to 5.5.7 2013-07-20 12:35:37 -04:00
Aidan Brady
cd53a8b4db Re-commit Dynamic Tank fix 2013-07-20 12:17:58 -04:00
Aidan Brady
26e86c8eee Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/RenderMechanicalPipe.java
	common/mekanism/common/BlockBasic.java
 2013-07-20 12:15:34 -04:00
Aidan Brady
cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Ben Spiers
ec9d74fe1a Hopefully solve all the rendering-based memory leaks 2013-07-19 19:59:01 +01:00
Ben Spiers
14c56c6041 Fix infinite liquid dupe bug. 2013-07-18 02:25:02 +01:00
Ben Spiers
92c3cb6811 Fix Mechanical Pipe non-vanilla liquid rendering. Closes #186 2013-07-17 20:01:16 +01:00
Aidan Brady
1b039bce4b Tiny cleanup 2013-07-08 18:58:26 -04:00
Aidan Brady
3f8deb946a Re-enabled face culling, re-fixed getPickBlock() 2013-07-08 18:52:03 -04:00
Ben Spiers
745f7d1f44 Hopefully re-fix #152 2013-07-08 23:38:53 +01:00
Ben Spiers
e50701da02 Hopefully fix NPE with Immibis' microblocks and avoid issue #152 recurring 2013-07-08 23:03:02 +01:00
Ben Spiers
73627f675a Make transmitters drop when shift-wrenched, like TE conduits 2013-07-08 20:47:10 +01:00
Ben Spiers
b2c32527c6 Add canWrench() checks to Block classes' onBlockActivated() methods 
to fix the mmMPS powerFist always rotating Mekanism machines.
 2013-07-08 20:43:28 +01:00