Commit graph

2012 commits

Author SHA1 Message Date
Matt Caughey
f4c7c7b564 Fixed boulder gen for tundras/wastelands 2014-03-18 17:45:58 -04:00
Adubbz
081bd5150b Merged changes from Forstride, fixed a nullpointer from left-in acacia references with Ore Dictionary registration 2014-03-18 20:44:49 +11:00
Adubbz
00d3c2f50a Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java
	src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java
	src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java
2014-03-18 20:13:10 +11:00
ted
8b33ee2a67 Merge pull request #205 from TheVikingWarrior/patch-3
Update it_IT.lang
2014-03-18 08:51:49 +01:00
TheVikingWarrior
2cb15459ed Update it_IT.lang 2014-03-17 19:08:18 +01:00
Adubbz
96b530d56b Forgot to readd the workaround for the Already Decorating! nonsense 2014-03-17 20:25:01 +11:00
Adubbz
1bd84e3652 Removed the Promised Land, did a significant cleanup of the system for world gen features 2014-03-17 20:16:22 +11:00
Matt Caughey
91e6c69737 Replaced sunflowers and high grass with different blocks 2014-03-16 21:49:18 -04:00
Matt Caughey
d78c8b09d9 Added flowering vines for the trees in the Mystic Grove 2014-03-15 19:41:36 -04:00
Matt Caughey
c0e5494638 Fixed Bayou trees 2014-03-15 18:00:10 -04:00
Matt Caughey
dceb3cd11f Changed boulders to use the vanilla boulder generation. 2014-03-15 17:17:38 -04:00
Matt Caughey
2c0aff1941 Various tweaks to biomes 2014-03-15 16:24:20 -04:00
Matt Caughey
d22dbc4a94 Finished the forced decorators for vanilla biomes 2014-03-15 16:00:00 -04:00
Adubbz
e017c2e752 Merge remote-tracking branch 'origin/master' 2014-03-15 19:55:24 +11:00
Adubbz
0a46079293 Renamed the Random Filter 2014-03-15 19:54:59 +11:00
Adubbz
a1bac65e18 Renamed the Random Filter 2014-03-15 19:52:55 +11:00
Adubbz
b42946c89b Merge remote-tracking branch 'origin/master' 2014-03-15 19:38:57 +11:00
Adubbz
9e1de9a173 Added a proper logger, added the beginnings of a "SubBlocks" layer for blocks with metadata. 2014-03-15 19:38:24 +11:00
Matt Caughey
fa0bd1dfff They're baaaaaaaaaaaaaaack! 2014-03-15 04:06:04 -04:00
Matt Caughey
a8bff3dc6c Tweaked some things in preparation for upcoming changes 2014-03-15 02:23:17 -04:00
Matt Caughey
a8ae7a0b3e Tweaked the swampland forced decorator, and added placeholders for other forced decorators 2014-03-14 23:27:27 -04:00
Matt Caughey
9e69fb5062 Added freshwater seaweed, started adding more forced decorators for vanilla biomes 2014-03-14 22:32:38 -04:00
Matt Caughey
bb6083a56e Added leaf piles and dead leaf piles 2014-03-14 19:00:22 -04:00
Adubbz
cbaa851f98 Merge pull request #201 from TheVikingWarrior/patch-2
Update it_IT.lang
2014-03-03 20:30:37 +11:00
TheVikingWarrior
d234f1801d Update it_IT.lang 2014-03-03 10:00:48 +01:00
ted
be1694347f Merge pull request #200 from VeryBigBro/patch-1
Update ru_RU.lang
2014-03-01 14:59:48 +01:00
Anton
ba151d4a25 Update ru_RU.lang 2014-03-01 15:56:00 +03:00
Adubbz
8eba756d2e Merge pull request #197 from mymagadsl/patch-2
Update zh_TW.lang
2014-02-28 17:09:22 +11:00
ted
fa420fab32 Merge pull request #198 from Vexatos/patch-1
Update de_DE.lang
2014-02-26 20:01:41 +01:00
ted
b7d7fc76fa Merge pull request #199 from QelioX/patch-1
Update ru_RU.lang
2014-02-26 20:01:33 +01:00
Aleksey Nazarov
0a469de216 Update ru_RU.lang 2014-02-26 20:11:45 +03:00
Vexatos
a4cbc97a65 Update de_DE.lang 2014-02-26 16:54:18 +01:00
mymagadsl
3ae18f3c33 Update zh_TW.lang
Error correction code and translation
2014-02-26 20:24:03 +08:00
Adubbz
cf28d6c52d Merge pull request #196 from mymagadsl/patch-1
Create zh_TW.lang
2014-02-26 18:08:10 +11:00
mymagadsl
f17b968253 Create zh_TW.lang
Converted from zh_CN
2014-02-26 14:33:39 +08:00
Adubbz
9b995adffd Derp 2014-02-19 18:14:14 +11:00
Adubbz
358920d81e Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-02-19 18:11:55 +11:00
Adubbz
2f648f2d5e Fixed version.properties since ntzrmtthihu777 has more OCD than i do 2014-02-19 18:10:35 +11:00
Adubbz
252e5ee5a4 Merge pull request #192 from fabricator77/master
Fixes biome decoration for Promised Land
2014-02-17 17:30:13 +11:00
fabricator77
2b6eda9004 Fixes biome decoration for Promised Land
reactivate commented out super.decorate calls
Filter Random to prevent -1 height crashes
fix treegen to use correct grass block.
2014-02-17 16:50:42 +10:30
Amnet
009df6aa0e Fix for slabs. 2014-02-15 22:16:50 +01:00
Amnet
155780276d Fix for the file name. 2014-02-15 21:53:41 +01:00
Amnet
b2d95e95b1 Fix for a crash with slabs. 2014-02-15 21:46:55 +01:00
Adubbz
1f90461b3e Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-02-15 10:40:11 +11:00
Adubbz
dec508a1f8 Fixed the nether floor being made of grass 2014-02-15 10:40:03 +11:00
Amnet
bf37b8ee19 Fixing issue #190 with duplicating bowls. 2014-02-14 02:11:45 +01:00
Adubbz
33b90334b4 Fixed server crash on startup. Fixes #176 #183 #186 2014-02-11 06:17:07 +11:00
Adubbz
8732497a24 Fixed crash on startup with the custom panorama. Fixes #185 2014-02-10 17:04:54 +11:00
Adubbz
4e12a7b9d8 Merge branches 'master' and 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-02-09 15:18:03 +11:00
Adubbz
6628fe0499 Fixed #184 2014-02-09 15:17:55 +11:00