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

2663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Spiers 8f6b0ce6de Fix Portable tank fluid setting bug 2014-09-02 18:44:31 +01:00
Ben Spiers c21404dd2d Make the tank-type renderers reset their DisplayLists on texture reload. 
This will prevent missing-texture/wrong-texture weirdness when changing texturepacks in-world. Also noticed that two old render classes from my first rewrite of transmitter rendering are now unused, so deleted them.
 2014-09-02 18:44:31 +01:00
Aidan C. Brady 99a5702de9 Cleanup - this renderer is so pretty 2014-09-02 08:08:03 -04:00
Ben Spiers 70ef6fb873 Make the Plastic Barrier coloured. 
Still no recipe, but I'm sure we'll get to that at some point.
 2014-09-02 03:22:02 +01:00
Ben Spiers 4ea93a6fa1 Add Connected textures to the opaque reactor blocks. 
They're not very good at the moment, but they look ok.
 2014-09-01 23:22:27 +01:00
Ben Spiers 999fe7719f Continue the attempting to be killing the bug with the fire... 2014-09-01 20:19:19 +01:00
Ben Spiers 7aa2617a96 Continue the attempting to be killing the bug with the fire... 2014-09-01 20:17:55 +01:00
Ben Spiers 33de5d3967 Merge branch 'experimentalCTM' into 1.8 2014-09-01 20:05:22 +01:00
Ben Spiers 6d0f8096f0 Add in support for rendering sides with overriden textures. 
Also special facing support. Salination Plants now fully connected - the Controller texture could do with some cleaning up to improve the connected look.
 2014-09-01 20:04:00 +01:00
Ben Spiers b1a11b0ba2 Further adapt the multiblock code. 
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
 2014-09-01 18:19:21 +01:00
Ben Spiers 0be5320143 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-09-01 04:10:53 +01:00
Ben Spiers 26cf0ee925 Merge branch 'master' into development 2014-09-01 04:06:47 +01:00
Ben Spiers 5ae5036e62 Replace the old connected glass renderer with one adapted from Chisel. 
I've made modifications to the original system to allow multi-meta CTM, such as between Dynamic Tanks and Dynamic Valves. This also allows texturing with effectively 5 textures, as opposed to the 47 needed previously
 2014-09-01 04:03:35 +01:00
Ben Spiers 6ffb64b740 KILL #1759 THE IMPOSSIBLE BUG KILL KILL 2014-08-31 20:30:41 +01:00
Aidan C. Brady f71b7e1e48 Wrote some tooltips! 2014-08-31 02:09:51 -04:00
Aidan C. Brady 9224d1278a Cleanup. Great work on the sound system overhaul, @unpairedbracket! It's perfect! 2014-08-31 02:01:11 -04:00
Aidan C. Brady ee379d7108 Added crush/enrich recipes for Fluix Dust and Crystals 2014-08-31 01:34:53 -04:00
Aidan C. Brady 98ca2315e2 Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. 2014-08-30 19:29:29 -04:00
Ben Spiers 3462126f3b Oops. Missed a loop with direct emission to BC. 2014-08-30 03:55:46 +01:00
Ben Spiers 87a692a325 Fix Sorter facing calculation. 2014-08-30 03:55:46 +01:00
Ben Spiers a8d04828ea Clean up some stuff using ForgeDirection's rotation matrix. 2014-08-30 03:55:46 +01:00
Ben Spiers 1ba5665e07 Fix indent. 2014-08-30 02:54:19 +01:00
Ben Spiers 779759ac1e Make the sound config options apply again. 2014-08-30 02:37:02 +01:00
Ben Spiers 05c7e63c55 Make shift not required to see contents of Portable Tanks. 
For convenience of NEI searching.
 2014-08-30 02:36:10 +01:00
Ben Spiers 0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Ben Spiers 1215b50e06 Fix config option. 2014-08-30 01:53:29 +01:00
Ben Spiers 94ca605b48 Remove some deprecation. 2014-08-30 01:51:53 +01:00
Ben Spiers 2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers c4d1fd32f4 Found a way to reduce the nasty sound delay when rapidly toggling sounds on and off. 2014-08-30 01:08:55 +01:00
Ben Spiers 3a0d0d2208 Make the fade-in times match the old Mek sound system, give some things a fade-out of 0.5s because it sounds nice that way. 2014-08-30 01:08:05 +01:00
Ben Spiers e83f3ee042 Merge branch 'soundsystem' into 1.8 
@aidancbrady, I got this working, might need some more refinement but
it's pretty stable
 2014-08-30 00:11:14 +01:00
Ben Spiers 9db096f9bf Pretty satisfactory implentation now, approaching point of being able to merge into 8.0. 2014-08-29 05:15:00 +01:00
Ben Spiers c71c5d9fe7 Fix integer conversion 2014-08-29 03:14:00 +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 5d346978db Fix Sorter facing calculation. 2014-08-28 20:59:36 +01:00
Ben Spiers e2fd40543e Clean up some stuff using ForgeDirection's rotation matrix. 2014-08-28 20:59:22 +01:00
Ben Spiers 9294719ab2 Cleanup 
Remove unused vars, add @Overrides, update deprecated methods.
 2014-08-28 20:07:51 +01:00
Ben Spiers e3fc694532 Fix Gas Generator item gas tank restoration. 2014-08-28 20:00:56 +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
Ben Spiers e0fc1194e1 Revert "Fix I goofed." 
This reverts commit 39509fc133.
 2014-08-28 03:29:42 +01:00
Ben Spiers 52b52e1c2e Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
 2014-08-28 03:29:11 +01:00
Ben Spiers 39509fc133 Fix I goofed. 2014-08-28 03:13:11 +01:00
Ben Spiers dd3ae67750 Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed. 2014-08-28 03:12:58 +01:00
Ben Spiers be3120800f First attempt at jetpack sounds under vanilla system. Bad. 2014-08-28 02:10:09 +01:00
Ben Spiers 896c943758 Cleaning up unused stuff and 3-space tabs (?) 2014-08-27 23:55:35 +01:00
Ben Spiers da6cbeb46d More big sound work 2014-08-27 23:16:59 +01:00
Ben Spiers 41be14fad4 Start to re-implement sound system in vanilla sounds. 
This will make us compatible with XU mufflers (when they're) fixed and
reduce unneccesary reinvention of wheels.
 2014-08-27 20:15:33 +01:00
Ben Spiers 96072e0f5e Merge branch 'development' into 1.8 2014-08-27 02:19:42 +01:00
Ben Spiers 40c06f1004 Fix secondary energy consumption with speed upgrades. 
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
 2014-08-27 02:17:45 +01:00
Ben Spiers c81da2aebe Remove unneccessary logging 2014-08-27 02:15:09 +01:00