Commit graph

1382 commits

Author SHA1 Message Date
TheVikingWarrior
652458617c Create it_IT.lang
Initial translation done, need to finish the tooltips and modules, and also control some stuff and if some of the GUIs fit in the machines
2015-03-23 22:13:35 +01:00
Aidan C. Brady
c52d41383f Fixed a few crashes 2015-03-22 22:52:37 -04:00
Aidan C. Brady
d2c6effabb Bump version to 8.0.2 2015-03-22 21:57:28 -04:00
Aidan C. Brady
62be3523d7 Fixed Gas Masks not working 2015-03-22 21:53:00 -04:00
Aidan C. Brady
4354357462 Added a null check 2015-03-22 21:41:59 -04:00
Aidan C. Brady
735217961c Fixed Configurator tooltip, fixed a major packet issue 2015-03-22 21:40:23 -04:00
Ben Spiers
4590a71759 Make the checking of instances of other mods' interfaces safer.
Fixes (part of) #2316
2015-03-23 01:11:45 +00:00
Ben Spiers
dfefcaf69a Fix #2303 2015-03-23 01:11:45 +00:00
Aidan C. Brady
e18cf2dd4a Fixed Digital Miner not auto-ejecting 2015-03-22 18:31:56 -04:00
Aidan C. Brady
36ffdeb0e5 Cleanup 2015-03-22 17:44:07 -04:00
Ben Spiers
1fe0484cd1 Fix notifyTileChanges() loading chunks. 2015-03-22 21:32:31 +00:00
Aidan C. Brady
c7d3b77112 Fixed another transition issue 2015-03-22 16:16:01 -04:00
Aidan C. Brady
2b2d9d69b3 Fixed transition crashes 2015-03-22 16:13:06 -04:00
Ben Spiers
09617fdb4c Gas Upgrade Recipe 2015-03-22 14:41:47 +00:00
Ben Spiers
0064f09d8c Backwards-compatibility for IGasHandler. #2267 2015-03-22 14:36:21 +00:00
Ben Spiers
050f3351e2 Fix advanced-recipe factories not using gas at first 2015-03-22 13:07:25 +00:00
Aidan C. Brady
d061792f3e Actually fix println 2015-03-22 01:33:25 -05:00
Aidan C. Brady
2ebb4838e8 Waila integration - fixes issues with Induction Cells & Induction Providers, also fixed println 2015-03-22 01:33:17 -05:00
Aidan C. Brady
e31d5573f1 Heat Generator now shows exact heat generation amount in GUI 2015-03-22 01:00:38 -05:00
Aidan C. Brady
d6c48a6e71 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-22 00:48:44 -05:00
Aidan C. Brady
9a2d47ad4b Default icons for all Mekanism blocks - fixes particle issues 2015-03-22 00:47:59 -05:00
Aidan C. Brady
dd96064a3f Fixed Electric Pump text overlap, fixed OreDict filter not reading from nbt/packet properly 2015-03-22 00:40:05 -05:00
Ben Spiers
c0281d4470 Fix #2298 2015-03-22 02:23:45 +00:00
Ben Spiers
a7c812bc6e Reduce paramaters of the reactor for more challenging balance.
Now requires 1GJ to ignite, and produces half as much power in passive mode.
The product of thermocouple efficiency and the laser input bonus must not be more than 1, (was previously 10) or energy from a laser that is absorbed (multiplied by the bonus coefficient) then propagates through the code and is multiplied by the thermocouple efficiency will come out bigger than it went in.
This would make the most efficient usage of a reactor simply shining a laser at it and pulling power out, producting net +49.5kJ/t.
This is now rectified, the product of bonus and thermocouple is now 0.5.
2015-03-22 02:16:17 +00:00
Aidan C. Brady
f8f1467304 Cleanup 2015-03-21 17:23:36 -05:00
Aidan C. Brady
e089413f30 Laser Amplifier now properly saves and loads its inventory from NBT 2015-03-21 17:18:14 -05:00
Ben Spiers
283053dab9 Fix a texture (rgb profile?) issue 2015-03-21 21:43:44 +00:00
Ben Spiers
c323969c87 Recalcuation things. 2015-03-21 19:44:17 +00:00
Ben Spiers
83e41478e5 Localisation, icon, fixes. 2015-03-21 19:13:15 +00:00
Ben Spiers
2e8edb281c Gas Upgrades. 2015-03-21 19:13:04 +00:00
Ben Spiers
0658e04880 Fix upgrade dupe with factories. 2015-03-21 19:12:55 +00:00
Ben Spiers
9936c05da7 Recipe and upgrade fixes. 2015-03-21 19:11:56 +00:00
Aidan C. Brady
84a1fa95ae Require a Hohlraum filled up to the max with D-T fuel in order to trigger a reaction 2015-03-21 12:44:37 -05:00
Aidan C. Brady
46eb5aa288 Fixed Hohlraum check crash 2015-03-21 12:42:41 -05:00
Aidan C. Brady
79d319cc87 Fixed temperature units 2015-03-21 11:51:11 -05:00
Aidan C. Brady
72026dd1c5 Lasers now dynamically damage entities based on energy output 2015-03-21 11:31:51 -05:00
Aidan C. Brady
765b58a058 Fixed a transition crash 2015-03-21 11:11:24 -05:00
Aidan C. Brady
a31449c2d3 Fixed the crafting issue - it was fairly silly, actually 2015-03-21 00:50:19 -05:00
Aidan C. Brady
3305581373 Fixed Precision Sawmill not applying secondary outputs 2015-03-20 23:16:48 -05:00
Aidan C. Brady
84759daacd Fixed Metallurgic Infuser not switching to inactive state 2015-03-20 23:04:33 -05:00
Aidan C. Brady
81b5724c53 Self-merged Chemical Infuser fix 2015-03-20 22:54:48 -05:00
Aidan C. Brady
39621a74b1 Added config to display profiled portable tanks 2015-03-20 22:46:26 -05:00
Aidan C. Brady
123199a689 Merge branch 'master' into development 2015-03-20 20:29:04 -05:00
Aidan
7c7007e2c4 Merge pull request #2270 from Mr-tanaka3/master
Update ja_JP.lang
2015-03-20 20:27:27 -05:00
David Vierra
30684d6aef Fix Metallurgic Infuser not auto-ejecting output
Fixes #2268

(it was trying to auto-eject energy cells :P)

I checked all of the other TileComponentEjector instances for similar errors, the rest of them look okay.
2015-03-20 14:16:23 -10:00
Aidan C. Brady
82c355cb86 Added a null check for transitions 2015-03-20 17:37:22 -05:00
Aidan C. Brady
37bc6a07c0 Flamethrowers now use gas 2015-03-20 17:34:11 -05:00
Aidan C. Brady
8173af50e0 Bump version to 8.0.1 - preparing to fix some bugs 2015-03-20 15:28:20 -04:00
Aidan C. Brady
e92f2654de API finalization, all set for release. 2015-03-20 14:18:18 -04:00
Aidan C. Brady
5206c6106e Use HTTPS for donator list download 2015-03-20 14:03:02 -04:00
Aidan C. Brady
2664e2e04c Perfected flamethrowers in SMP 2015-03-20 13:13:24 -04:00
Aidan C. Brady
5a35d54a5c Flamethrower networking fixes 2015-03-20 13:06:19 -04:00
Aidan C. Brady
caab819663 Fixed Fluid Gauge crash 2015-03-20 12:15:07 -04:00
Aidan
1914c1cdfc Merge pull request #2252 from halvors/translation
Added Norwegian translation
2015-03-20 10:37:57 -04:00
Halvor Lyche Strandvoll
4beea9481a Added no_NO.lang 2015-03-20 15:35:04 +01:00
Aidan
fe80ecb190 Merge pull request #2251 from Adaptivity/development
Update ru_RU.lang
2015-03-20 10:18:23 -04:00
Anton
5635a72745 Update ru_RU.lang 2015-03-20 16:28:39 +03:00
Vexatos
85fe0fa129 Update de_DE.lang 2015-03-20 13:43:28 +01:00
Vexatos
2d9e094c85 Re-added comments to de_DE.lang 2015-03-20 13:39:35 +01:00
Vexatos
46f013c35b Update de_DE.lang
Comments will come back later today. I was in a hurry
2015-03-20 06:57:54 +01:00
Aidan C. Brady
6d85b0800f Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP 2015-03-20 01:39:22 -04:00
Aidan C. Brady
857954575a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-20 01:30:17 -04:00
Aidan C. Brady
8d83ada60f Fixed a Laser Amplifier & Laser Tractor Beam inventory crash, fixed missing sounds for Chargepad, Chemical Crystallzer, Chemical Washer & Metallurgic Infuser 2015-03-20 01:30:11 -04:00
Mrkwtkr
f03c9bd03a Update zh_CN.lang 2015-03-20 13:10:13 +08:00
Aidan C. Brady
c3ef938166 Implemented the SoundWrapper system again - for some reason dedicated servers won't behave without it on OS X 2015-03-19 23:16:27 -04:00
Mr-tanaka3
739e8f95e3 Update ja_jp.lang 2015-03-20 10:42:32 +09:00
Aidan C. Brady
6bae353118 Fixed a transition crash 2015-03-19 20:41:18 -04:00
Aidan C. Brady
6276439c51 Fixed Charcoal Blocks and Refined Flowstone screwing up 2015-03-19 20:16:21 -04:00
Aidan C. Brady
eb7865b967 Eject config now should transition between versions. 2015-03-19 20:05:37 -04:00
Aidan C. Brady
b096202137 Hopefully finish off the migration of side configuration 2015-03-19 19:31:17 -04:00
Aidan C. Brady
6bea59ab5e Upgrades should now transition between v7 and v8 2015-03-19 18:57:09 -04:00
Aidan C. Brady
061c84d586 Even better factory transition 2015-03-19 18:53:02 -04:00
Aidan C. Brady
d3df5c5ce7 Attempt a fix at factory world transition 2015-03-19 18:12:06 -04:00
Aidan C. Brady
a1929b1918 Added recipe to turn brine into salt 2015-03-19 17:44:27 -04:00
Aidan C. Brady
a6e8fc8de0 Energy usage calculations are now much more efficient 2015-03-19 17:36:43 -04:00
Aidan C. Brady
763aef4fd0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-19 17:22:45 -04:00
Aidan C. Brady
3b96fe4a4c Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator 2015-03-19 17:22:31 -04:00
Ben Spiers
2a3ddd014b Remove FMLRenderAccessLibrary reference 2015-03-19 16:41:07 +00:00
Ben Spiers
b69e6a9d80 Make temperatures consistent. 2015-03-19 16:41:07 +00:00
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
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
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 C. Brady
d61723c5f7 Fixed a few issues - Oredictionificator filter system is done 2015-03-16 07:58:53 -04:00
Aidan C. Brady
2cd3d5d899 Work on GUI 2015-03-15 23:39:55 -04:00
brian lewis
2a1fe5b3e9 [#2210] fix for NPE on placing an empty gas-burning generator 2015-03-15 19:26:12 -05:00
Aidan C. Brady
f51c528bbf Added recipes for new v8 content 2015-03-15 17:57:15 -04:00
Aidan C. Brady
9f20e0bce0 Oredictionificator work 2015-03-13 20:37:20 -04:00
Aidan C. Brady
6870b211c5 Oredictionificator work 2015-03-13 10:20:19 -05:00
Aidan C. Brady
8a88df5f1c Start on Oredictionificator! 2015-03-13 09:14:57 -05:00
Aidan C. Brady
6e3efacffb Hide Heat Transmitter until it's finished 2015-03-12 23:48:13 -05:00
Aidan C. Brady
ca16c64de1 Fixed a crash 2015-03-12 23:37:04 -05:00
Aidan C. Brady
093d18e6fa Implemented a failsafe tick handler in FrequencyManager, fixed a small deactivation mishap 2015-03-12 23:29:11 -05:00
Aidan C. Brady
6801092113 Fixed data fetch 2015-03-12 23:17:25 -05:00
Aidan C. Brady
f9c10d9012 More work on teleporters, implemented chunkloading 2015-03-12 22:55:37 -05:00
Aidan C. Brady
9c21621c06 Just about finished! Teleporter & Portable Teleporter work with the new frequency system perfectly. 2015-03-12 17:30:40 -05:00
Aidan C. Brady
6d36926866 Work on Portable Teleporter, need to fix the screwed up GUI 2015-03-12 16:52:04 -05:00
Aidan C. Brady
9043e12938 Work on new Portable Teleporter GUI - going to basically be a clone of the regular teleporter GUI without an inventory view 2015-03-12 11:18:12 -05:00
Aidan C. Brady
d16a6f06ee Teleporting works! Tomorrow I'll try and implement the Portable Teleporter. 2015-03-12 01:32:24 -05:00
Aidan C. Brady
cefd4ba107 Fixed another NBT issue 2015-03-12 01:18:21 -05:00
Aidan C. Brady
c2c3bd14bc Many fixes - still need to get private frequencies to load 2015-03-12 01:03:31 -05:00
Aidan C. Brady
dc611eb0b2 Work on GUI, things are starting to work 2015-03-11 18:13:47 -05:00
Aidan C. Brady
76b93bec65 More teleporter work. Getting pretty complicated, hopefully I can pull this off 2015-03-11 17:42:33 -05:00
Aidan C. Brady
855a5acf1d Code cleanup 2015-03-11 15:41:13 -05:00
Aidan
a86bb36ca0 Merge pull request #2193 from Siigari/development
Remastered and looped audio correctly.
2015-03-11 11:01:01 -05:00
Aidan C. Brady
8da23839f3 Merge branch 'master' into development
Conflicts:
	src/main/resources/assets/mekanism/sounds/Elementizer.ogg
2015-03-11 11:00:32 -05:00
Aidan
c394c7c9bb Merge pull request #2186 from Archtikz/development
Completely remade Seismic Reader.
2015-03-11 10:59:31 -05:00
Aidan C. Brady
5e5975bc58 Work on new teleporter system - still a lot to do 2015-03-11 10:58:15 -05:00