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

201 commits

Author SHA1 Message Date
Aidan C. Brady
52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady
523ec21467 Added button to remove upgrade, fixed font size. Almost done! 2014-07-22 22:16:20 -04:00
Aidan C. Brady
790cd33f2d Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-22 20:37:59 -04:00
Aidan C. Brady
6470f69569 A big load of work on the new upgrade GUI 2014-07-22 20:37:53 -04:00
Ben Spiers
84daf186ca More Reactor GUI work 2014-07-23 01:25:10 +01:00
Ben Spiers
775ba68482 Tweaking of lasers for packet-efficiency 2014-07-22 22:34:19 +01:00
Ben Spiers
c66676dd55 Fix some Server-side packets being sent by the client 2014-07-22 21:13:01 +01:00
Ben Spiers
327389a88c Get Lasers kind of working vs. dediservers 2014-07-22 21:11:43 +01:00
Ben Spiers
dd421f7308 This should stop the servercrashing issue 2014-07-22 18:03:34 +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
99482d8fd0 Fixed a minor issue 2014-07-21 22:24:27 -04:00
Aidan C. Brady
25cf5236ea A few fixes 2014-07-21 21:33:43 -04:00
Aidan C. Brady
076c5f7377 More work! 2014-07-21 21:21:53 -04:00
Aidan C. Brady
2523d2fd6b Did some work on actual upgrade system 2014-07-21 20:46:35 -04:00
Aidan C. Brady
0b8ec37164 More work on upgrade GUI, also made SimpleGui packets send new window ID to client 2014-07-21 19:15:27 -04:00
Aidan C. Brady
e778449045 More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers. 2014-07-21 18:07:15 -04:00
Aidan C. Brady
48183f6670 Work on the new upgrade system, specifically with GUI changes 2014-07-21 17:47:29 -04:00
Aidan C. Brady
f2441a1ebd Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/recipe/BinRecipe.java
	src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
 2014-07-21 17:02:06 -04:00
Aidan C. Brady
0864e1061a Merge a few more fixes 2014-07-21 16:45:08 -04:00
Aidan C. Brady
27056da3e4 Merge back a few bug fixes 2014-07-21 16:41:27 -04:00
Aidan C. Brady
4fcd3b47c5 Fix a few little bugs 2014-07-21 16:34:31 -04:00
Aidan C. Brady
d16483f4b1 Started work on the new upgrade system, as well as the new GUI 2014-07-21 14:57:31 -04:00
Aidan C. Brady
0416e2e904 Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks 2014-07-21 13:30:39 -04:00
Aidan C. Brady
69a411813e Started work on a Digital Miner visual render thing. For some reason it's culling all oceans. 2014-07-21 01:10:53 -04:00
Aidan C. Brady
7e525e10c6 Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -04:00
Aidan C. Brady
c1b317dcde Added in warning for missing stacks. Onto visual Digital Miner range rendering! 2014-07-20 21:20:45 -04:00
Aidan C. Brady
2b817e28cd Fixed an issue with Bins, also fixed a small GUI issue with the new filter system 2014-07-20 20:30:35 -04:00
Aidan C. Brady
de86e0b2a2 Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks. 2014-07-20 20:19:01 -04:00
Aidan C. Brady
4adb6de83d Fix a few bugs 2014-07-20 16:16:09 -04:00
Aidan C. Brady
fe177d20c7 Filter-based replacing works! Now to get the require system to work and the warning system set up. 2014-07-20 16:06:47 -04:00
Aidan C. Brady
ad505cf882 More work! Networking is just about complete, and all filter creation and edit GUIs now have replace stack slots and replace required buttons. 2014-07-20 15:45:44 -04:00
Aidan C. Brady
ddc499c9fe More work on Digital Miner filter system, also fixed a little memory leak 2014-07-20 15:27:35 -04:00
Aidan C. Brady
13afad3b0d Started work on new Digital Miner filter system 2014-07-19 19:55:34 -04:00
Aidan C. Brady
a48a0101e9 Flamethrowers are just about polished! Just need to do a few more entity damage refinements. 2014-07-19 14:41:27 -04:00
Aidan C. Brady
87f92326f9 Work on flame vector calculation - still need to get it to catch blocks and entities on fire properly 2014-07-19 02:34:07 -04:00
Aidan C. Brady
cfc308b042 Flames now render how I want them to! Tomorrow I add logic, such as the burning of entities and the smelting of blocks. 2014-07-18 01:34:56 -04:00
Aidan C. Brady
9469fcb51a Started work on actual flame implementation 2014-07-17 20:06:51 -04:00
Aidan C. Brady
2f4d545fb5 Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too. 2014-07-17 17:18:53 -04:00
Aidan C. Brady
7ddb8e9727 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-07-16 23:59:07 -04:00
Aidan C. Brady
cfeb08a8ee Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash 2014-07-16 23:53:00 -04:00
Aidan C. Brady
be7ea115b6 Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously) 2014-07-16 16:59:45 -04:00
Aidan C. Brady
6e5eca9d4e Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-15 22:59:20 -04:00
Aidan C. Brady
ee789547c6 A bit of work on flamethrower sound effect handling 2014-07-15 22:59:14 -04:00
Ben Spiers
bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Ben Spiers
cb2188580e More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary. 2014-07-16 02:54:13 +01:00
Aidan C. Brady
f9fdb56e24 Fixed a few tiny laser compile issues 2014-07-14 17:23:42 -04:00
Aidan C. Brady
a98bf8bba3 Merge branch 'development' into 1.8 2014-07-14 17:15:26 -04:00
Aidan C. Brady
de1e264c68 Merge branch 'master' into development 2014-07-14 17:15:11 -04:00
Aidan C. Brady
146d974479 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
Ben Spiers
c009940140 Fix Railcraft Dependency 
This is such a pain.
 2014-07-14 20:47:45 +01:00