Commit graph

183 commits

Author SHA1 Message Date
Adubbz
043e749df4 Merged Amnet's changes that i missed 2013-05-07 18:24:45 +10:00
Adubbz
40c2847366 Fixed flowers/thorns once and for all 2013-05-07 18:19:09 +10:00
Adubbz
f68fd802b9 Revert "Fixed the world gen for plants and flowers."
This reverts commit ca5b7b4fe8.
2013-05-07 17:43:37 +10:00
Matt Caughey
f7ae70170f Tweaked some biomes. Changed the level of slowness mudballs give when hitting entities. 2013-05-07 00:41:56 -04:00
Amnet
0b8635fbf8 Added foliage offset 2013-05-07 03:06:20 +02:00
Matt Caughey
ac6be03582 Started adding the dart blower. Added poison item. 2013-05-06 21:02:25 -04:00
Amnet
ca5b7b4fe8 Fixed the world gen for plants and flowers. 2013-05-07 02:04:56 +02:00
Matt Caughey
960be72fe9 Changed the default biome size, distance between villages, and what biomes villages can spawn in. Added poison ivy to Ominous Woods. 2013-05-06 06:27:39 -04:00
Matt Caughey
d3af5f7482 Added poison ivy to other biomes 2013-05-06 06:19:33 -04:00
Adubbz
8032a052d5 Removed unecessary { and } use 2013-05-06 20:11:52 +10:00
Adubbz
50969cb1bc Fixed poison ivy 2013-05-06 20:10:01 +10:00
Adubbz
4293e12f4f Work on making Posion Ivy actually poison mobs/the player 2013-05-06 20:04:16 +10:00
Matt Caughey
9120596b79 Added poison ivy, changed high grass (top) metadata value from 6 to 7. 2013-05-06 05:21:53 -04:00
Adubbz
b5a8acfae8 Adjusted a few hitboxes. Didn't bother with them all, just the glaringly bad ones. 2013-05-06 18:33:07 +10:00
Adubbz
fd6f243456 Fixed BOPFlower checks on World Gen 2013-05-06 17:41:57 +10:00
Adubbz
dbf3241b55 Moved BOPCrossIntegration to PostInit (Using Annotations this time!) 2013-05-06 17:11:55 +10:00
Matt Caughey
8b54bb7f66 Finished up what needed to be done with the reeds. Added 2 new mushrooms (Portobello and Blue Milk Cap). 2013-05-06 01:58:23 -04:00
Amnet
ebc99f5eb4 Fixed the reeds. 2013-05-05 19:15:49 +02:00
Matt Caughey
8c044949c3 Started adding a new reed plant 2013-05-05 11:45:04 -04:00
Adubbz
62267f5dc8 Merged Forstride's BlockBOPFlower changes 2013-05-05 11:34:32 +10:00
Adubbz
4348490256 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-05 11:27:47 +10:00
Adubbz
52cb252d6f Attempted to properly fix yucca flowers on hard dirt 2013-05-05 11:23:54 +10:00
Matt Caughey
3d4037b544 Made some changes to the Lush Desert 2013-05-04 21:21:08 -04:00
Adubbz
62a45a1baf Made yuccas properly generate in the Canyon 2013-05-05 10:34:46 +10:00
Matt Caughey
32a2940081 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-04 20:06:44 -04:00
Matt Caughey
16eb2a2ea6 Changed around the Canyon biome a bit. 2013-05-04 20:06:17 -04:00
Adubbz
0057913fdd Adjusted humidity of the Heathland and Fen 2013-05-05 09:56:28 +10:00
Adubbz
705105c3e6 Fixed cattail dupe drops on sheared 2013-05-05 09:52:26 +10:00
Adubbz
09f287dada Fixed High Cattail pickblock 2013-05-05 09:52:06 +10:00
Adubbz
59717f6170 Fixed willow colouring 2013-05-05 09:51:19 +10:00
Adubbz
c5251b6274 Fire now burns infinitely on ash 2013-05-05 09:50:42 +10:00
Adubbz
07e0611b0a Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-04 20:10:08 +10:00
Adubbz
cfe73c2225 Minor tweaks to High Grass and High Cattail 2013-05-04 20:09:29 +10:00
Matt Caughey
561652be8a Added high cattails to other swampy biomes. 2013-05-04 04:58:05 -04:00
Adubbz
73eca33198 Fixed cattail crash, hitboxes for High Grass and High Cattail no longer take up both blocks 2013-05-04 18:33:28 +10:00
Matt Caughey
357142bd6b Work in progress high cattails. Ran into a NullPointerException and need some help fixing it. 2013-05-04 02:44:17 -04:00
Matt Caughey
11aaf4091b Added Yucca flower that generates in desert biomes 2013-05-03 18:28:11 -04:00
Adubbz
a508261cf8 Revert Forstride's derp 2013-05-03 23:00:44 +10:00
Matt Caughey
d880bd5f61 Setting up SourceTree, yet againn 2013-05-03 08:42:16 -04:00
Matt Caughey
bc9bd3bda5 The rudder moves when I turn the wheel. 2013-05-03 06:39:32 -04:00
Adubbz
dffcb15204 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-03 17:01:04 +10:00
Adubbz
8d7937def6 Updated to 1.5.2. Not exactly necessary as we are covered by SRG Names, but still a good thing to do 2013-05-03 17:00:20 +10:00
Amnet
53de38ad99 Fixed issue #41. 2013-05-02 20:29:59 +02:00
Adubbz
524eaf27d7 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-01 20:32:45 +10:00
Adubbz
0585d09cbf Removed useless gitignores and gitattributes, removed new the sky colour from the new Jungle Biome. 2013-05-01 20:26:49 +10:00
Amnet
ca70475c5d Added the choice of village biomes to the config. 2013-05-01 12:15:03 +02:00
Adubbz
c48d3c8f4d Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-05-01 19:24:25 +10:00
Adubbz
ef4dd081cc Adjusted Bamboo Forests to Forstride's liking 2013-05-01 19:23:58 +10:00
Amnet
5e1f83ac34 Finished the thaumcraft aspects. 2013-05-01 11:15:16 +02:00
Amnet
86cde9b500 Fixed placing of mangrove and holy saplings. 2013-05-01 10:59:00 +02:00
Amnet
3696e24901 Fixed BOP items. 2013-05-01 02:55:18 +02:00
Amnet
2dc2662e1d Fixed Red Rock. 2013-05-01 02:39:34 +02:00
Amnet
f9610f1c2c Fixed the config option for adding biomes to vanilla world types. 2013-05-01 01:06:05 +02:00
Amnet
cc2f9f8f87 Fixed leaves decay. 2013-04-30 18:08:42 +02:00
ted80-PC
8a6422d8af Added enhanced biomes to bwg4 api 2013-04-30 13:12:01 +02:00
ted
4f85088533 Update BOPConfiguration.java 2013-04-29 21:22:44 +03:00
Amnet
4bb75c9e8a Fixed my own derp with the recipes using ore dictionary. 2013-04-29 16:06:18 +02:00
Amnet
7dc1a1c442 Merge remote-tracking branch 'origin/master' 2013-04-28 20:06:43 +02:00
Amnet
7c8414581f Made some crafting recipes obey the Ore Dictionary.
Fixed the jungle biome issue.
2013-04-28 19:37:12 +02:00
Amnet
325ac1eb0c Added Witch Huts, Jungle and Desert Temples to some of the biomes in BOP
World Type.
2013-04-28 13:54:04 +02:00
Adubbz
2d0cdadbd0 Moved all integration to init instead of post init. Post init was just fucking everything up 2013-04-28 15:53:45 +10:00
Adubbz
9d8e5cbca5 Fixed Thaumcraft aspects, huzzah! 2013-04-28 13:09:58 +10:00
Adubbz
26b86f7403 Finished pff the Thaumcraft aspects, may be a few things missing, but it's definately up to a pretty good tsandard 2013-04-28 11:04:17 +10:00
Adubbz
4ec2e3065d Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-04-28 09:45:59 +10:00
Adubbz
4195f72861 Added aspects for some misc blocks 2013-04-28 09:45:39 +10:00
Amnet
9a47fb67c8 Blocks added to Forestry backpacks. 2013-04-28 00:05:54 +02:00
Amnet
9b1041ad63 Fixed adding biomes for world types.
BOP biomes now accessible in Large Biomes World Type.
Biome size is now specific to only BOP World Type.
2013-04-27 15:37:08 +02:00
Adubbz
52a42f8d3d Added terrain blocks to the Forestry Global Manager 2013-04-27 17:36:12 +10:00
Adubbz
4920f35504 Updated the name of the BOP record, as per the request of Forstride 2013-04-27 07:40:28 +10:00
Adubbz
14fad6d63a Added aspects for saplings 2013-04-26 13:21:17 +10:00
Adubbz
780cd313dc Added aspects to leaves and some random placer items 2013-04-26 12:43:38 +10:00
Adubbz
f4190c9e88 Adjusted changelog, added Thaumcraft aspects to planks 2013-04-26 10:37:49 +10:00
Adubbz
02d3fc104b Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-04-26 06:40:34 +10:00
Adubbz
77a6f3d3ed Added planks to BlockReferences and started on items in Thaumcraft Integration 2013-04-26 06:39:46 +10:00
Amnet
e206c8a2c2 Finished ID usage reduction.
Renamed texture files to be more adequate to in-game names. 
Added the possibility of having different texture for heart of every
log.
2013-04-25 18:28:57 +02:00
Amnet
f05287a236 Tweaked the generation of Cattail. 2013-04-25 12:49:08 +02:00
Amnet
fb1c0b362a Added configurable spawn distance between villages in BOP World Type
Added more biomes to spawn villages in
2013-04-25 12:38:55 +02:00
Amnet
5e6c5f4d06 Added hardcoded foliage colors 2013-04-25 08:35:53 +02:00
Amnet
26c8eb2679 Fixed how the saplings grow 2013-04-25 01:31:48 +02:00
Amnet
ff149f05a0 Fixed mudballs in dispensers (had to move to separate ID)
Added seeds on destroying our grasses
Added carrots / potatoes dropped on destroying sprouts (1% chance)
Added golem compatibility with our apple leaves for Thaumcraft
Added random drop of apples when destroying apple leaves
Added flowers to plants created on bonemeal use
Changed recipe for Bamboo Thatching
Added bamboo usable as sticks
2013-04-25 00:45:57 +02:00
Adubbz
10326d1396 Added the Thaumcraft API, started Thaumcraft integration and created a way of referencing BOP blocks easily 2013-04-24 13:13:22 +10:00
Adubbz
2e69ff3714 Renamed duplicte saplings 2013-04-24 07:04:57 +10:00
Adubbz
e23d1cec4b Revert naming change to planks, inconsistant plus breaks textures 2013-04-24 06:49:47 +10:00
Amnet
5e19939047 Reduced IDs a little more. 2013-04-23 15:03:29 +02:00
Amnet
c853d692a1 Cleaned up configuration. Some refactoting. 2013-04-23 12:35:29 +02:00
Adubbz
4387e43847 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-04-23 11:56:43 +10:00
Adubbz
79e9289b50 Added and changed a few Biome Dictionary types 2013-04-23 11:54:03 +10:00
Adubbz
1f3643e829 Fixed spelling derp 2013-04-23 11:53:21 +10:00
Amnet
00bc9eeddf Turning back on beaches in origin valley. 2013-04-23 01:37:49 +02:00
Adubbz
b7c71ba3a8 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-04-23 08:21:13 +10:00
Adubbz
f0d7ba6ee4 Gave the different types of Autumn and Cherry leaves different names 2013-04-23 08:20:28 +10:00
ted
d6880c78b7 Added Biome Dictionary 2013-04-22 23:46:38 +03:00
Adubbz
9013e314a3 Added the option to disable ocean generation 2013-04-23 06:28:21 +10:00
Amnet
8abccb9e3f Some fixes here and there. Refactoring the code. 2013-04-22 18:14:07 +02:00
Adubbz
d8131a04db Removed debug from testing the fix for resources on the desktop 2013-04-22 22:49:30 +10:00
Adubbz
b00f7e71dd Fixed missing texture error 2013-04-22 22:48:57 +10:00
Adubbz
2a6f6c3951 Biomes O Plenty flowers can now be used with Forestry bees. (May only be for bees that need normal flowers though, couldn't find anywhere for custom flower types (desert, hell etc)) 2013-04-22 22:33:07 +10:00
Adubbz
0af3f744ef Made BoP saplings work in the Forestry fermenter 2013-04-22 21:00:57 +10:00
Amnet
1d49f953bb Nerfed the growth rate of apples.
Divided integration to different files.
2013-04-22 11:45:37 +02:00
Adubbz
be1a80107a Removed a bunch of side-onlys that were causing a server crash 2013-04-22 16:51:39 +10:00