Commit graph

2281 commits

Author SHA1 Message Date
Aidan C. Brady
088cd2f4d3 A few bin fixes 2015-03-17 17:26:59 -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
brian lewis
2a1fe5b3e9 [#2210] fix for NPE on placing an empty gas-burning generator 2015-03-15 19:26:12 -05:00
Aidan
7cfc0c5c3f Merge pull request #2192 from Siigari/master
Remastered, downmixed audio, improved levels, created seamless looping.
2015-03-11 10:59:48 -05:00
Siigari
58ea87fef0 Remastered and downmixed audio, improved levels and created seamless looping. 2015-03-09 19:58:07 -07:00
Aidan
0ae83150ab Merge pull request #2165 from Dannerick/myDev1
New config entries
2015-03-04 13:46:00 -05:00
Aidan C. Brady
df51d6f18f Fixed cables screwing up over chunk bounds 2015-03-04 13:39:25 -05:00
Aidan C. Brady
90e8d407df Transmitter issue fixed, closes #2139 2015-03-04 00:12:01 -05:00
Brian Lewis
4d8f43dbad Added atomic disassembler energy usage to config file [#2146] 2015-03-03 10:05:25 -06:00
Brian Lewis
112c1a1ba9 Add ethylene burn time as a config entry 2015-03-03 10:05:10 -06:00
Aidan C. Brady
bf42f71b8e Fixed a few crashes 2015-02-25 09:15:08 -05:00
Aidan C. Brady
d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Aidan
995c798767 Merge pull request #2152 from Dannerick/myDev1
Fix for a gas-generator with empty tank throwing exception (bug #2148)
2015-02-24 08:39:27 -05:00
Brian Lewis
8570748ad9 Fix for a gas-generator with empty tank throwing exception during onChunkLoad (bug #2148) 2015-02-23 10:14:10 -06:00
Aidan
079ca960ee Merge pull request #2128 from chrixian/master
Shift-click items to top (fill) slot
2015-02-20 10:55:07 -05:00
Ben Spiers
dd404b4209 Let's try that again, shall we? Reimplement redstone checks to not load chunks. 2015-02-20 13:56:36 +00:00
Aidan C. Brady
b1caa56f5a Fixed PRC gaseous NEI usage lookup 2015-02-19 18:36:08 -05:00
Aidan C. Brady
1e78cbf60e Fixed an impossible crash 2015-02-19 16:53:06 -05:00
Aidan C. Brady
0310cc6f14 Cleanup 2015-02-19 16:37:28 -05:00
Aidan
0e50db9d1a Merge pull request #2140 from Dannerick/MyDev1
Fix for setting generator output when ethylene already in tank when plac...
2015-02-19 16:36:01 -05:00
Aidan C. Brady
46f5a941ad Cleanup 2015-02-19 16:34:59 -05:00
Aidan
def3d6a729 Merge pull request #2141 from Dannerick/MyDev2
[#2069] Fix for modded items being added to cardboardbox blacklist
2015-02-19 16:34:00 -05:00
Ben Spiers
17f9f88b34 Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
Also make them deterministic again to prevent them getting stuck
2015-02-19 16:36:16 +00:00
Aidan C. Brady
0819c0ad5f Hopefully fixed the transmitter network halt issue. Provide feedback! 2015-02-19 09:13:03 -05:00
Brian Lewis
e842556c5b [#2069] Fix for modded items being added to cardboardbox blacklist 2015-02-18 17:30:09 -06:00
Brian Lewis
d41fec6031 Fix for setting generator output when ethylene already in tank when placed 2015-02-18 17:25:16 -06:00
Aidan C. Brady
dcf7d7772a Fixed a transporter output bug 2015-02-17 21:34:36 -05:00
Aidan C. Brady
488af7e8ae Fixed facing updates not being sent out by machines 2015-02-16 18:12:31 -05:00
Aidan
b885742690 Merge pull request #2001 from Dannerick/master
Fix for #1997 gasGenerators incorrectly limiting output
2015-02-16 14:32:52 -05:00
Ben Spiers
0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00:00
Christian Ehrhardt
db4adce2a8 Shift-click items to top (fill) slot 2015-02-12 19:18:16 -06:00
Ben Spiers
7e08643ebd ConcurrentHashMaps don't like null keys 2015-02-12 16:59:39 +00:00
Ben Spiers
122f4190bd Remove some bad/unneeded imports 2015-02-12 16:42:25 +00:00
Ben Spiers
e6a4d3efb2 Screw it, let's just make these concurrent.
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
2015-02-12 16:39:48 +00:00
Aidan C. Brady
81c948f28d Fixed capes 2015-02-11 08:36:52 -05:00
Aidan C. Brady
b1ebcd0e5e Merged! 2015-02-10 11:33:28 -05:00
Aidan
48620d77e1 Merge pull request #2099 from RichJeanes/patch-1
Update README.md
2015-02-08 16:26:13 -05:00
Aidan
6d5ea1f184 Merge pull request #2112 from Sakarias-Longhorn/patch-1
Update fr_FR.lang
2015-02-08 16:25:57 -05:00
Aidan
c635df73eb Merge pull request #2098 from al-myr/patch-2
Update pt_BR.lang
2015-02-08 16:25:51 -05:00
Aidan
4ffd064c06 Merge pull request #2073 from Adaptivity/patch-4
Update ru_RU.lang
2015-02-08 16:25:45 -05:00
Aidan
021f7a1bb7 Merge pull request #2062 from BrunoLG/patch-7
Update pt_BR.lang
2015-02-08 16:25:40 -05:00
Sakarias Longhorn
cde1ab3967 Update fr_FR.lang 2015-01-29 17:24:43 +01:00
Rich Jeanes
a9e71c985c Update README.md
Grammar
2015-01-22 09:24:17 -07:00
Al
a2d79d5ca5 Update pt_BR.lang
Fixed: "Paxel"

Minecraft vanilla:
item.leggingsCloth.name=Leather Pants
item.leggingsCloth.name=Calça de Couro (pt_BR)
2015-01-21 09:37:08 -03:00
Ben Spiers
3e38ac37f4 This feature request has been more trouble than it's worth. 2015-01-19 12:16:04 +00:00
Ben Spiers
2ced2e3860 Fix the bad implementation of the ambient lighting toggle 2015-01-19 12:07:54 +00:00
Ben Spiers
1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers
89be8b4482 Fix using localised names for overlay textures. 2015-01-10 17:47:16 +00:00
Ben Spiers
1a6a2e9530 Update version number.
I'm going to use GitHub's release feature until the build server's fixed.
2015-01-10 17:13:35 +00:00
Ben Spiers
143c968a8a Update some deps to see if the buildserver's fixed yet 2015-01-10 03:19:31 +00:00