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

2435 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ben Spiers
54328ceb35 Sanify keybinds somewhat. 
ClientTickHandler was getting way out of hand.
 2014-08-27 01:22:39 +01:00
Aidan C. Brady
ec1c02d2e5 Cleanup 2014-08-25 09:00:01 -04:00
Aidan C. Brady
ba71f26a75 Updated Forge 2014-08-25 08:43:16 -04:00
Aidan C. Brady
34bcc8d068 Updated IC2 API 2014-08-25 08:03:03 -04:00
Aidan C. Brady
6714034771 Fixed RedstoneArsenal dependency 2014-08-24 16:32:20 -04:00
Aidan C. Brady
775e1fbd6d Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
 2014-08-24 09:51:12 -04:00
Aidan C. Brady
c364496212 Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null 2014-08-24 09:46:38 -04:00
Aidan C. Brady
649f5b0867 Fixed a few GUI bugs 2014-08-23 15:46:13 -04:00
Aidan C. Brady
b6b6276346 Laid foundation for Industrial Turbine and Thermoelectric Boiler 2014-08-23 11:41:35 -04:00
Aidan C. Brady
2383e0477b Merge branch 'development' into 1.8 2014-08-23 11:07:21 -04:00
Aidan C. Brady
bbef6aa2b9 A couple crash fixes 2014-08-23 11:07:03 -04:00
Aidan C. Brady
66971fd753 Implemented the new changes into TankUpdateProtocol 2014-08-22 23:12:01 -04:00
Aidan C. Brady
7e6be317af Added prefab classes for UpdateProtocol and ThreadMultiblockSparkle, still yet to get the Dynamic Tank to extend them 2014-08-22 18:34:19 -04:00
Aidan C. Brady
8cae029ed7 Created a new prefab TileEntityMultiblock class and merged all Dynamic Tank multiblock-specific code into it. 
Should make it much easier to create the new Steam Boiler and Steam Turbine!
 2014-08-22 16:17:16 -04:00
Aidan C. Brady
55e70d5f5c Removed println 2014-08-21 20:48:23 -04: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
80021dd4c7 Work on path caching 2014-08-20 15:54:05 -04:00
Aidan C. Brady
275c7840cc Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
Aidan C. Brady
7c09e9a47d Merge branch 'development' into 1.8 2014-08-20 14:38:46 -04:00
Aidan C. Brady
a0622523d1 Added check for 7.0-7.1 Bin crashes 2014-08-20 14:38:11 -04:00
Aidan C. Brady
333fcd8ef1 Added a check to prevent null world calls 2014-08-20 14:35:19 -04:00
Aidan C. Brady
baae072601 Merged the updateCapacity() fix to development 2014-08-20 14:07:54 -04:00
Aidan C. Brady
64e9996adb no message 2014-08-20 14:06:23 -04:00
Aidan C. Brady
d24eaddee4 Added in algorithm to merge both fluid and item data of Dynamic Tank multi blocks 2014-08-20 08:49:52 -04:00
Aidan C. Brady
540eed908e Added cache implementation of EIM 2014-08-20 08:27:44 -04:00
Ben Spiers
c24c11cb33 Make things like the ExtraUtils muffler actually have an effect on our machines. VERY HACKY. 2014-08-20 01:30:55 +01:00
Aidan C. Brady
6b4ef3bb50 Merge branch 'development' into 1.8 2014-08-19 19:08:47 -04:00
Aidan C. Brady
8c58a9eaed Fixed crash related to OreDictCache 2014-08-19 19:06:50 -04:00