Commit Graph

2187 Commits

Author SHA1 Message Date
Matt Caughey e2009cb743 More things 2014-04-07 08:50:33 -04:00
Matt Caughey a6af72f650 Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2014-04-07 08:00:56 -04:00
Matt Caughey cd523cc86f Things 2014-04-07 08:00:17 -04:00
Adubbz de46afb2f9 Merge pull request #211 from TheVikingWarrior/patch-4
Update it_IT.lang
2014-04-07 20:32:58 +10:00
Matt Caughey 96fe82f5da Added Jelly Blocks 2014-04-07 06:25:55 -04:00
TheVikingWarrior fddeaf43d5 Update it_IT.lang 2014-04-06 13:27:23 +02:00
Adubbz 39361a9005 Bad conventions are bad 2014-04-04 19:30:37 +11:00
ted 5495691a3a Merge pull request #209 from Sodiet/patch-2
Update ru_RU.lang
2014-04-03 18:15:10 +02:00
Rostislav 000a84e84a Update ru_RU.lang
Translation updated.
2014-04-03 22:14:17 +06:00
Adubbz 7da30b7fa3 Because apparently there is a witch hunt going on for this 2014-04-03 16:27:41 +11:00
Matt Caughey 72c53ce6f4 Fixed Cold Beaches generating around Mystic Groves, and made the Coniferous Forest look nicer 2014-04-01 20:25:40 -04:00
Matt Caughey e5c3636f0b Made the April Fools joke a liiiiiiiiiiitle less invasive 2014-04-01 10:31:54 -04:00
Matt Caughey d6e50e9ad9 Tweaked a few textures 2014-04-01 08:05:08 -04:00
Matt Caughey e96a1fc698 Tweaked some biome decoration things 2014-04-01 06:37:59 -04:00
Adubbz ada18c601d Fixed a bug with config options 2014-04-01 20:33:59 +11:00
Matt Caughey b7b08d205e Fixed moss placement 2014-04-01 04:08:22 -04:00
Matt Caughey 27a026f155 Renamed Algae to Duckweed, renamed Seaweed to Algae, changed a few textures, and other minor changes. 2014-03-30 23:13:57 -04:00
Adubbz 5eac042a59 Delete dependancies.info 2014-03-28 18:48:10 +11:00
Adubbz 742aecdb21 Updated the license to 4.0 2014-03-23 10:47:49 +11:00
Adubbz 02bcd1fbea The Flower Field now actually has flowers in it... 2014-03-22 10:40:49 +11:00
Adubbz 8472ceb3c8 Removed y offset on tiny cactus, began work on Nether Biomes, fixed a bug with anything working as a furnace fuel and prevented our decoration from occuring outside of the BoP worldtype 2014-03-22 10:25:40 +11:00
Adubbz 3202b992a9 Fixed Forced Decorators with grass and flowers 2014-03-20 13:46:02 +11:00
Adubbz 20228278dd Fixed an issue with the Bamboo Forest not being decorated properly 2014-03-19 22:24:45 +11:00
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
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