Commit graph

272 commits

Author SHA1 Message Date
Adubbz
019487d9bc Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-03-19 18:48:05 +11:00
Adubbz
65d77e07e5 Preliminary fix for Forced Decorators, fixed a bug with moon phases. Closes #206 2014-03-19 18:47:49 +11:00
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
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
0a46079293 Renamed the Random Filter 2014-03-15 19:54:59 +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
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
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
6628fe0499 Fixed #184 2014-02-09 15:17:55 +11:00
Progwml6
4b1620619b fix errors with setAttribute 2014-02-05 20:13:11 -05:00
Progwml6
5cd8db4551 fix several compile errors from remapping 2014-02-05 20:06:41 -05:00
Progwml6
6572cecccd Run repo through remapping script -- UNTESTED 2014-02-05 19:45:49 -05:00
Matt Caughey
7f6ccd4b4b Fixed double ferns generating in certain swampy biomes instead of double tall grass 2014-02-03 12:07:57 -05:00
Matt Caughey
255244bc4b Added Mahogany logs/leaves/planks/saplings/etc. for Tropical Rainforest trees 2014-02-02 15:58:33 -05:00
Matt Caughey
bb47c64501 Made pixies spawn in the Mystic Grove. Added ichor (Soon to be dropped by imps) 2014-02-02 14:32:34 -05:00
Adubbz
28196bc02f Actually... May as well make them WARM by default instead of HOT 2014-02-02 12:24:09 +11:00
Adubbz
20a70cac10 Added an alternate constructor to BOPBiomeEntry for Nether biomes 2014-02-02 12:23:34 +11:00
Adubbz
a711956168 Added support for registering non-overworld biomes 2014-02-02 12:19:54 +11:00
Adubbz
17bc711416 Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-02-02 11:02:02 +11:00
Adubbz
04a8bcf0c5 Toying with buckets 2014-02-02 11:01:52 +11:00
ted
eb0381d385 Fix 2014-02-01 16:20:12 +01:00
ted80-PC
bb1c84fb40 Nether biome gen
Disabled biome deco: ChunkProviderBOPHell line 570
Add new hell biomes at: BiomeLayerHellBiomes line 23
2014-02-01 16:12:05 +01:00
Adubbz
286a2f2824 Updated the basics of fluids 2014-01-30 17:04:09 +11:00
Matt Caughey
197d97e217 Tweaked biome radar text 2014-01-29 07:58:13 -05:00
Adubbz
9ae50323ae Reduced the biome radar jump distance to 512 to make any biomes found in a realistic to travel to distance 2014-01-29 22:00:29 +11:00
Adubbz
b155f08ac3 Fixed NPE on startup, fixed mob/record sounds once and for all 2014-01-29 19:55:12 +11:00
Adubbz
d02729b423 Commented out the Promised Land Biome Dictionary entries 2014-01-29 14:37:33 +11:00
Adubbz
ee221165bc Commented out the Promised Land biomes and the teleported to the dimension for now, need to redo the current biome system to support dimension-specific biomes 2014-01-29 14:30:13 +11:00
Adubbz
3d85b36a46 Biome Finder complete. 2014-01-29 14:27:02 +11:00