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
|
b4be235f82
|
Merge branch 'master' into development
|
2014-07-21 16:59:18 -04:00 |
|
Ben Spiers
|
5f26402bd9
|
Minor cleanup and tabs
|
2014-07-21 21:48:28 +01: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 |
|
Ben Spiers
|
fd9fb0713e
|
Merge pull request #1559 from jstockwin/development
Stop energy cube core rendering when cube is empty.
|
2014-07-21 21:20:38 +01:00 |
|
jstockwin
|
0a9dbec78c
|
Stop energy cube core rendering when cube is empty.
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
|
2014-07-21 21:14:12 +01:00 |
|
Ben Spiers
|
cc33ad2181
|
Update Development.md
It wasn't really correct any more
|
2014-07-21 20:13:59 +01: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
|
e66d4c5d93
|
Merge branch 'development' into 1.8
|
2014-07-20 15:28:29 -04:00 |
|
Aidan C. Brady
|
545849f187
|
Merge branch 'master' into development
|
2014-07-20 15:28:18 -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
|
db7b44edf1
|
Merge pull request #1547 from sb023612/master
Update zh_CN.lang
|
2014-07-20 11:28:11 -04:00 |
|
sb023612
|
7660a828b8
|
Update zh_CN.lang
|
2014-07-20 21:01:54 +08:00 |
|
sb023612
|
fe845c21d9
|
Update zh_CN.lang
|
2014-07-20 20:56:15 +08: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
|
00abd47b84
|
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
|
2014-07-19 02:34:13 -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 |
|
Ben Spiers
|
7b8b75759c
|
More GUI Work. Nowhere near finished yet, there's a lot of information to squeeze in.
|
2014-07-19 04:03:32 +01:00 |
|
Ben Spiers
|
2e7d3a1945
|
Work on making it work Client-side.
|
2014-07-19 03:23:11 +01:00 |
|
Ben Spiers
|
16e38fafbe
|
Fix things, adjust the algorithm slightly to model the differential equation better.
|
2014-07-18 23:29:45 +01:00 |
|
Aidan
|
2e1b010e81
|
Merge pull request #1538 from Vexatos/patch-4
Update de_DE.lang
|
2014-07-18 08:34:43 -04:00 |
|
Vexatos
|
ad82a76a0d
|
Update de_DE.lang
|
2014-07-18 09:57:03 +02:00 |
|
Aidan C. Brady
|
497997d0e4
|
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
|
2014-07-18 01:35:03 -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 |
|
Ben Spiers
|
be15bab0b7
|
More Reactor work. Making way for persistent reactor state and guis and stuff.
|
2014-07-18 02:29:19 +01: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
|
c9f569fd4a
|
Merge branch 'development' into 1.8
|
2014-07-17 01:44:54 -04:00 |
|
Aidan C. Brady
|
0a1afbae93
|
Fixed a major issue that was causing transmitter networks to be ticked twice in a single tick
|
2014-07-17 01:44:32 -04:00 |
|
Aidan C. Brady
|
186e6f5f05
|
Fix a silly bug with tile sounds I just created
|
2014-07-17 01:28:20 -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
|
8ccf4e6653
|
Fixes!
|
2014-07-16 19:16:38 -04:00 |
|
Aidan C. Brady
|
4309a7d7b1
|
More work - SoundHandler now uses a channel-based system for sounds.
|
2014-07-16 17:07:54 -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 |
|