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
Aidan C. Brady
cfdaf37e4b
Moved MFR back into api package.
2014-07-12 16:10:10 -04:00
Ben Spiers
0758ad752b
Fix un-checked MFR API usage
2014-07-12 21:04:33 +01:00
Aidan C. Brady
79f27e9d11
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2014-07-12 16:02:32 -04:00
Aidan C. Brady
369eb012af
Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash
2014-07-12 16:02:21 -04:00
Ben Spiers
a8bfe29c8e
Depend on EnderIO and ExtraUtilities
...
If this doesn't fix it I don't know what will
2014-07-12 19:03:17 +01:00
Ben Spiers
f095cbd3fd
Fix the BuildCraft API dependency
...
Hopefully fix some issues.
2014-07-12 18:46:43 +01:00
Aidan C. Brady
390f0b06bc
Force Mekanism to load after FMP
2014-07-12 12:59:44 -04:00
Aidan C. Brady
5bc7288bc2
Mekanism v7...official release.
2014-07-12 00:05:19 -04:00
Ben Spiers
e3f8508527
Merge branch 'development' into 1.8
2014-07-12 01:56:13 +01:00
Ben Spiers
4500232762
More constants!
...
Refine constants based on findings of experimentation with the Sage simulator I wrote (here: https://gist.github.com/unpairedbracket/43ee788498dd5dcd1011 )
2014-07-12 01:54:53 +01:00
Aidan C. Brady
6095f6e062
Fixed the evil mac sound bug by increasing the sampling rate and doubling the buffer size to two bytes. Also removed printlns.
2014-07-11 16:07:58 -04:00
Aidan C. Brady
177372e9fe
Rewrote idle path calculations of Logistical Transporters!
...
Firstly, stacks will no longer will remember their home locations after a single failed home routing calculation. More importantly, instead of recursively pathfinding the furthest transporter from a stack's current location, the stack will randomly select a direction to start traveling. Once it reaches the end of a line of transporters, it will attempt to recalculate a path to an inventory. If it is unsuccessful, it will simply pick another direction to start traveling and the process will repeat. This keeps the previous behavior, but does it much less CPU-intensively.
2014-07-11 14:52:55 -04:00
Aidan C. Brady
4ba9afb369
Updated recipes to be more consistent. This was about all I wanted to accomplish for v7...either I make Gas Cells tomorrow or I push the release.
2014-07-11 01:45:44 -04:00
Aidan C. Brady
ee00c5a22b
Chemical Dissolution Chamber now can accept upgrades
2014-07-11 00:42:06 -04:00
Aidan C. Brady
60b226600f
Fixes galore!
2014-07-11 00:34:05 -04:00
Aidan C. Brady
eda233f1cf
More GUI bugs!
2014-07-10 23:12:19 -04:00
Aidan C. Brady
77d3469f61
Fix a few GUI bugs
2014-07-10 23:06:35 -04:00
Aidan C. Brady
171c9767e0
Chemical Crystallizer now accepts upgrades
2014-07-10 22:40:20 -04:00
Aidan C. Brady
65a8633441
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
2014-07-10 22:28:04 -04:00
Aidan C. Brady
7198704363
Fixed a crash!
2014-07-10 18:13:56 -04:00
Aidan C. Brady
fc878661d5
Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank
2014-07-10 18:08:53 -04:00
Aidan C. Brady
12f3ef8665
Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload.
2014-07-10 17:51:26 -04:00
Aidan C. Brady
16c5f7cdb3
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-07-10 16:25:04 -04:00
Aidan C. Brady
1f9782d1c7
Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids
2014-07-10 16:24:55 -04:00
Ben Spiers
a643f1c35c
Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance.
2014-07-10 19:24:33 +01:00
Ben Spiers
55b178b907
Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance."
...
This reverts commit 7394ceda8f
2014-07-10 19:22:54 +01:00
Aidan C. Brady
95b6ac8be1
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-07-10 13:35:37 -04:00
Aidan C. Brady
fc138c57c2
Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them
2014-07-10 13:30:58 -04:00
Ben Spiers
7394ceda8f
Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance.
2014-07-10 16:53:01 +01:00
Ben Spiers
cd10bc88c8
Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces.
2014-07-10 16:53:01 +01:00
