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
Aidan C. Brady
ee789547c6
A bit of work on flamethrower sound effect handling
2014-07-15 22:59:14 -04:00
Ben Spiers
8673440172
Reactor Logic work. More complex now, and more realistic, taking some cues from BigReactors' example.
...
Plasma conducts temperature to the casing, which then conducts to coolant or the environment. Energy from passive cooling is stored in an internal buffer.
2014-07-16 02:54:13 +01:00
Ben Spiers
62659afadb
Reactor Multiblock work
2014-07-16 02:54:13 +01:00
Ben Spiers
445cb7a0a4
You are not using Wolfram|Alpha now, @unpairedbracket.
2014-07-16 02:54:13 +01: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
cdeb25803c
Started work on flamethrower sounds, also increased efficiency of SoundHandler (now loops over sounds only once instead of twice)
2014-07-15 01:09:38 -04: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
Aidan C. Brady
a24bd2e7ad
A bit of work on teleporter localization. There's something weird going on, though.
2014-07-14 12:57:57 -04:00
Ben Spiers
8d36e9a152
Fix a bizarre bug I introduced ages ago.
2014-07-14 16:23:03 +01:00
Aidan C. Brady
23b6ce5105
Merge branch 'development' into 1.8
2014-07-13 23:52:29 -04:00
Aidan C. Brady
1094475344
Fixed teleporter crash, fixed asset issue
2014-07-13 23:52:17 -04:00
Aidan C. Brady
ad0a71ee71
Merge branch 'development' into 1.8
2014-07-13 23:34:28 -04:00
Aidan C. Brady
17f8fa11da
Implemented robit crash fix
2014-07-13 23:34:01 -04:00
Aidan C. Brady
ddb6140513
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-13 23:27:28 -04:00
Aidan C. Brady
9592d7f024
Flamethrower fixes!
2014-07-13 23:27:23 -04:00
Ben Spiers
11e21e1957
Start on implementation of lasers.
2014-07-14 01:34:26 +01:00
Ben Spiers
700cc76c35
Fix a different, unrelated OreDict issue.
2014-07-13 19:58:00 +01:00
Ben Spiers
39c6b45a2c
Fix Iron Dust smelting issue. Close #1478
2014-07-13 19:58:00 +01:00
Ben Spiers
c560bdc2e1
Fix a different, unrelated OreDict issue.
2014-07-13 19:53:41 +01:00
Ben Spiers
3e3bf2c25c
Fix Iron Dust smelting issue. Close #1478
2014-07-13 19:53:41 +01:00
Aidan C. Brady
1a458834a8
Work on making flamethrowers work nice. Still need to get first person neutral particles down.
2014-07-13 13:32:28 -04:00
Aidan C. Brady
6fbfd22583
Merge branch 'development' into 1.8
2014-07-13 00:16:05 -04:00
Ben Spiers
4bea4c62fd
Remove stray @Method
...
Should fix #1500
2014-07-13 05:06:57 +01:00
Aidan C. Brady
3f7de46991
Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation
2014-07-12 23:59:39 -04:00
Aidan C. Brady
6cc7efc64b
Merge branch 'master' into 1.8
2014-07-12 22:53:21 -04:00
Aidan C. Brady
c223eabb95
Fixed Combiner NEI texture, fixed Cardboard Box not working
2014-07-12 22:52:13 -04:00
Aidan C. Brady
6271284436
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-12 22:35:04 -04:00
Aidan C. Brady
9abc111ecd
Baby Skeletons, started work on Flamethrower
2014-07-12 22:34:58 -04:00
Ben Spiers
0638cdb61c
More work on Fusion Reactor and Lasers
2014-07-13 02:46:47 +01:00
Aidan C. Brady
cf6f5ab387
Bump versions to 8.0.0
2014-07-12 18:52:46 -04:00
Aidan C. Brady
246c9426be
Merge branch 'development' into 1.8
2014-07-12 18:50:05 -04:00
