Aidan C. Brady
9c6708660b
Fixed Metallurgic Infuser tooltip
2015-03-19 09:28:50 -04:00
Aidan C. Brady
b51fbe79fd
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-19 08:54:06 -04:00
Aidan C. Brady
7bfaa738e3
Fixed teleporter crash
2015-03-19 08:53:43 -04:00
Ben Spiers
d560ea91a8
Move lighting config to general.
...
Hopefully fixes whatever weird issue was going on before.
2015-03-19 12:47:36 +00:00
Aidan C. Brady
7dec274a56
Fixed server-sided light value calls
2015-03-19 07:06:21 -04:00
Aidan
74009de13b
Merge pull request #2233 from halvors/ignoreforge
...
Ignores Minecraft Forge files in .gitignore.
2015-03-19 07:03:10 -04:00
Halvor Lyche Strandvoll
87bbf22a8b
Ignores Minecraft Forge files in .gitignore.
2015-03-19 08:59:12 +01:00
Ben Spiers
35b3ec365f
Fix a reactor controller serverside crash
2015-03-19 00:43:07 +00:00
Ben Spiers
b817b2840c
Fix Generator Tiles' client/server sidedness
2015-03-19 00:36:29 +00:00
Ben Spiers
a90680eaae
Fix sounds on the client-side of factories
2015-03-19 00:16:36 +00:00
Ben Spiers
efeeb06b77
Move rendering IDs to Common Proxy classes to appease ExtraUtils.
2015-03-18 21:39:01 +00:00
Ben Spiers
e36ecf9f05
Clean up and fix some stuff from the rebase pull.
2015-03-18 21:00:11 +00:00
Ben Spiers
a21e679a1d
Make Lasers better at server-side
2015-03-18 20:52:58 +00:00
Ben Spiers
0307acc7eb
Fix sounds on the server side.
2015-03-18 20:52:58 +00:00
Ben Spiers
eb5e8b0cca
Make the reactor use Hohlraums properly
2015-03-18 20:47:31 +00:00
Aidan C. Brady
143777ae6e
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-18 14:32:00 -04:00
Aidan C. Brady
339e048a4e
After much client code isolation, there should be no more issues on the server side with sounds
2015-03-18 13:26:12 -04:00
Aidan
78cb22e27e
Merge pull request #2222 from Adaptivity/development
...
Update ru_RU.lang
2015-03-18 12:46:30 -04:00
Anton
c02724d40f
Update ru_RU.lang
2015-03-18 18:03:29 +03:00
Aidan
12b6b4610b
Merge pull request #2221 from halvors/development
...
Cleanup, cleared some warnings.
2015-03-18 08:55:37 -04:00
Halvor Lyche Strandvoll
97e51e0c26
Cleanup, cleared some warnings.
2015-03-18 13:51:14 +01:00
Aidan C. Brady
cc5080d908
Cleanup
2015-03-18 07:50:17 -04:00
Aidan C. Brady
1b813b4142
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-18 07:48:59 -04:00
Aidan C. Brady
398fa5d01a
Added that nullary constructor
2015-03-18 07:48:52 -04:00
Ben Spiers
4e3999ea9c
Make the rendering of Induction Matrix internals a bit nicer.
2015-03-18 01:32:35 +00:00
Ben Spiers
60a32d44f6
CTM for the Induction Matrix internals. @aidancbrady, what do you think?
...
Feel free to revert if you preferred it how it was.
2015-03-18 01:10:52 +00:00
Aidan C. Brady
6502ee031b
Cleaned up integration code, added minor aluminum ore processing. Adding new resources for full recipe processing is now stupid easy.
2015-03-17 20:22:15 -04:00
Ben Spiers
e9a3000e8d
Add Optional removal of IToolHammer. Fixes #2216
2015-03-17 23:49:45 +00:00
Ben Spiers
01f37e552e
Make induction ports work with connected textures.
2015-03-17 23:49:45 +00:00
Aidan C. Brady
ad2a354f45
Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable)
2015-03-17 19:16:36 -04:00
Aidan C. Brady
f5d94ca1dc
Perfected Portable Tank valve animation
2015-03-17 18:02:07 -04:00
Aidan C. Brady
3c39af45de
Added Crescent Hammer support
2015-03-17 17:44:28 -04:00
Aidan C. Brady
6847a1e9ee
Minor cleanup
2015-03-17 17:36:32 -04:00
Aidan C. Brady
1f28a9bfbf
Transporters now have deeply integrated support for bins, including prediction algorithms
2015-03-17 17:30:40 -04:00
Aidan C. Brady
a5a9ab9daf
Merge branch 'master' into development
2015-03-17 17:27:17 -04:00
Aidan C. Brady
088cd2f4d3
A few bin fixes
2015-03-17 17:26:59 -04:00
Aidan C. Brady
2749adcc06
Made sure transporters check strict inventory stack limits, fixed the AE2 interaction
2015-03-17 15:30:40 -04:00
Aidan C. Brady
c991e12bea
Removed test recipe. IMC is done!
2015-03-17 10:50:45 -04:00
Aidan C. Brady
bfbddd3c47
Standardize the names of machine outputs
2015-03-17 10:29:09 -04:00
Aidan C. Brady
1071b57b7d
IMC API for machines!
2015-03-17 08:43:41 -04:00
Aidan C. Brady
749c579bb3
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-16 15:05:49 -04:00
Aidan C. Brady
71420a2550
Fixed PlayerSound fade effect
2015-03-16 15:05:43 -04:00
Ben Spiers
71a9bfc4f9
Make the @Optional removals stricter.
...
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00
Aidan C. Brady
9db789674a
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-16 11:43:41 -04:00
Aidan C. Brady
d1990c232d
Finished off Oredictionificator
2015-03-16 11:43:28 -04:00
Ben Spiers
797308f587
Update Forge version.
...
Account for the random inexplicable non-existence of FMLRenderAccessLibrary
2015-03-16 15:22:19 +00:00
Aidan C. Brady
1580d968ec
Updated CoFH API
2015-03-16 11:12:48 -04:00
Aidan C. Brady
77c68b05bf
Merge branch 'master' into development
2015-03-16 11:03:07 -04:00
Aidan C. Brady
02cb425cbd
Work on Oredictionificator operations
2015-03-16 11:02:54 -04:00
Aidan
9a704f2812
Merge pull request #2211 from Dannerick/myDev1
...
[#2210 ] fix for NPE on placing an empty gas-burning generator
2015-03-16 11:02:30 -04:00
