Commit graph

2410 commits

Author SHA1 Message Date
Adubbz
70ee74d2fb Merge pull request #472 from Adaptivity/BOP-1.7.10-2.1.x
Additional OreDictionary support
2015-05-11 05:58:24 +10:00
Adubbz
b086ba5098 Merge pull request #471 from Adaptivity/mudpickfix
Fix incorrect Harvest level for mud pick
2015-05-11 05:57:35 +10:00
Adubbz
044551cbdf Merge pull request #470 from Adaptivity/BOP-1.7.10-2.1.x
Fixed compile issues Closes #468 and #469
2015-05-11 05:56:28 +10:00
Anton
483e4ab5ea Additional OreDictionary support 2015-05-10 20:00:01 +03:00
Anton
00fb76e1c6 Fix incorrect Harvest level for mud pick 2015-05-10 18:36:26 +03:00
Anton
a686a469a3 Fixed compile issues 2015-05-10 18:17:30 +03:00
Adubbz
4e29004d82 Merge pull request #464 from wwrpg/patch-5
Fixed #433
2015-05-08 16:22:05 +10:00
Adubbz
c204b968c6 Merge pull request #463 from wwrpg/patch-4
Fixed #406 and #450
2015-05-08 16:21:47 +10:00
Adubbz
a4fcec3c20 Merge pull request #465 from wwrpg/patch-8
Fixed #392
2015-05-08 16:21:24 +10:00
Adubbz
9d9c80ef47 Merge pull request #467 from Adaptivity/patch-2
Update ru_RU.lang
2015-05-08 16:21:02 +10:00
Anton
a4bd579020 Update ru_RU.lang 2015-05-08 09:11:17 +03:00
wwrpg
2476cbf4b4 Fixed #392
Enable leaves and logs to burn.
2015-05-07 22:23:40 -07:00
wwrpg
5cb17a1c2d Fixed #433
Removed renderAsNormalBlock returning false to allow beds, torches, and monsters to spawn. Tested that block still renders the grass correctly.
2015-05-07 22:15:02 -07:00
wwrpg
7b643024cc Fixed #406 and #450
Fixed bugs where two saplings dropped on a neighbor block change or no saplings dropped.
2015-05-07 21:35:56 -07:00
wwrpg
acee9f596a Fixed #406 and #450
Fixed bug where two saplings dropped on a neighbor block change.
2015-05-07 21:28:15 -07:00
Adubbz
d3d46a4a72 Merge pull request #462 from wwrpg/patch-5
Fixed #419
2015-05-08 06:05:34 +10:00
Adubbz
b033713727 Merge pull request #461 from wwrpg/patch-4
Patch 4
2015-05-08 06:04:18 +10:00
wwrpg
9c2f8af89c Disable spawning pixies if ID is 0
Disable spawning pixies if pixie ID is 0 or less. Also fixed minor bug where empty jar was not being placed back in player's hand
2015-05-07 10:58:56 -07:00
wwrpg
f16f6c29e1 Disable spawning wasps
Do not spawn wasp if not enable (not rendered)
2015-05-07 10:26:50 -07:00
wwrpg
589e150521 Cleanup up code for Redwood trees
Removed boolean variables flag, isSoil, and hasSpace. Replaced with a "return false" since code returns false whenever those are false anyways. This improves performance and cleans up some unneeded nesting making it easier to read. Still need to remove extra parenthesis blocks (but held off on this since it makes the diff very hard to read)
2015-05-07 09:49:05 -07:00
wwrpg
62c52eb04b Update WorldGenRedwoodTree.java 2015-05-07 09:47:53 -07:00
wwrpg
0da14fd3e1 Cleanup up code for Redwood trees
Removed boolean flag, isSoil, and hasSpace. Replaced with a "return false" since code returns false whenever those are false anyways. This improves performance and cleans up some unneeded nesting making it easier to read. Still need to remove extra parenthesis blocks (but this makes the diff very hard to read)
2015-05-07 09:39:43 -07:00
Adubbz
c8d822ffe1 Merge pull request #460 from wwrpg/patch-8
Fixed #442
2015-05-07 16:17:03 +10:00
wwrpg
0aeb107d21 Fixed #442
Added limits to meta to prevent ArrayIndexOutOfBoundsException similar to BlockBOPNewDirt.java. 
Still probably a deeper issue here, but this will prevent crashes for now
2015-05-06 14:17:04 -07:00
Adubbz
6cb19c6bbd Merge pull request #458 from wwrpg/patch-5
Update WorldGenRedwoodTree2.java
2015-05-06 16:19:23 +10:00
Adubbz
a0ac3f02be Merge pull request #456 from wwrpg/patch-4
Update ItemBiomeFinder.java
2015-05-06 16:19:14 +10:00
wwrpg
0b7af69e01 Update WorldGenRedwoodTree2.java
Improved redwood generation performance
2015-05-05 14:10:06 -07:00
wwrpg
a305036e2e Update ItemBiomeFinder.java
Fixed for-loop range and added missing breaks to improve performance
2015-05-04 11:31:32 -07:00
Adubbz
39ce365b3f Update ClientProxy.java 2015-04-16 06:20:43 +10:00
Matt Caughey
b785a2d47f Added a Dense Forest biome 2015-04-14 18:23:33 -04:00
Matt Caughey
7d57bc6b29 Improved the Shield biome 2015-04-14 04:08:37 -04:00
Matt Caughey
846b456b07 Tweaked the Land of Lakes biome, added wild rice 2015-04-07 16:26:39 -04:00
Matt Caughey
4eae73fe11 Tweaked biome temperatures 2015-04-07 15:15:24 -04:00
Matt Caughey
5bcfa6d9d7 Added a Xeric Shrubland biome. Tweaked the Steppe biome. 2015-04-07 12:48:59 -04:00
Adubbz
d8de516753 Merge pull request #449 from Vanhal/patch-1
Avoid NPE in the fuel handler
2015-04-07 20:19:10 +10:00
Vanhal
24fe0f8e8b Avoid NPE in the fuel handler
Passing a null ItemStack or if a badly implemented item (the for some reason returns null) is passed the game will crash with a NPE.
2015-04-07 10:57:20 +01:00
Adubbz
5e15b1f3ad Syntax 2015-04-06 12:57:53 +10:00
Adubbz
97a881d9ff Fixed an issue caused by fluid conflicts 2015-04-06 12:57:32 +10:00
Adubbz
b1e202f752 Merge pull request #446 from jaquadro/fix-fog-render
Fix fog color calculation in 'fast' graphics mode.
2015-04-04 10:20:17 +11:00
Justin Aquadro
5e6caa34d4 Fix fog color calculation in 'fast' graphics mode. 2015-04-03 19:06:06 -04:00
Matt Caughey
2504737e12 Removed loamy grass/dirt from the Marsh 2015-04-02 09:05:26 -04:00
Adubbz
ecf4dcb7be Merge pull request #440 from wilkemeyer/bugfix-oobCrash-1
Fixed Array-Bounds-Check
2015-03-30 08:27:51 +11:00
Florian Wilkemeyer
8efcb9c075 Fixed Array-Bounds-Check in ItemBlockFruit (should also fix NEI-Based crashes occurring since build 1142) 2015-03-29 17:51:45 +02:00
Adubbz
c572546353 Fixed redwood tree growth 2015-03-29 10:29:01 +11:00
Adubbz
bf50843441 Fixed the flowering leaves overlay being used on incorrect blocks 2015-03-29 09:26:02 +11:00
Matt Caughey
8acb24cad7 Added flowering oak leaves to some biomes 2015-03-28 14:58:41 -04:00
Adubbz
2e471767ea Flowering leaves now render properly 2015-03-28 23:52:50 +11:00
Adubbz
2825f7b649 Potentially fixed problems with biome ids + 128 2015-03-28 22:26:25 +11:00
Matt Caughey
dccabb6e95 Increased amount of roots that generate by default 2015-03-28 05:25:46 -04:00
Matt Caughey
040065ba29 Added pinecones 2015-03-28 05:17:23 -04:00