Commit graph

1499 commits

Author SHA1 Message Date
Adubbz
a99679b06b Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2013-11-23 09:17:53 +11:00
Adubbz
8088e4a54a Clamped the hive getIcon to prevent crashes for people with ID conflicts 2013-11-23 09:17:13 +11:00
Adubbz
e833fd60fd Update build.xml 2013-11-22 21:40:34 +11:00
Adubbz
84a12fac6b Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2013-11-22 20:25:27 +11:00
Adubbz
06e133f5d9 Boring build file stuff 2013-11-22 20:25:21 +11:00
Adubbz
727cea79b4 Update build.xml 2013-11-22 20:16:01 +11:00
Adubbz
3400ea1676 Reduced pixie spawns, disabled lighting in the Promised Land (As a result, performance should be far less of a problem than it previously was) 2013-11-22 20:09:53 +11:00
Adubbz
fde082074a Buckets holding BOP Fluids will now cross over to 1.7 when the time comes 2013-11-22 12:55:13 +11:00
Adubbz
92e8a5136d And apparently Rosester's had the RenderPlayer method in them... Right... 2013-11-22 09:29:29 +11:00
Adubbz
f0120e5269 Pixie particles are now only spawned on the client (Fixes an NPE with them) 2013-11-21 16:34:05 +11:00
Adubbz
83c7ae8fd4 Attempted to fix TE integration 2013-11-21 06:30:35 +11:00
Adubbz
2726ed1e58 Fixed a derp with colorized leaves ids 2013-11-21 06:00:01 +11:00
Adubbz
fbbd3deef4 Fixed #128 2013-11-20 06:15:56 +11:00
Adubbz
daf66a261c Changed the way we check for the client, as per Mistaqur's advice 2013-11-20 05:58:57 +11:00
Adubbz
712e5970bc Removed commented TE stuff, since that is automatically handled now. Still need to fix the pulveriser recipes for bones. 2013-11-19 20:43:26 +11:00
Adubbz
11bc53eada Moved TE integration to preinit 2013-11-19 20:00:07 +11:00
Adubbz
223f807173 Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2013-11-19 19:55:54 +11:00
Adubbz
0b954634a9 Tinkering with the new TC API/IMC system 2013-11-19 19:55:48 +11:00
Adubbz
b4339fa558 Updated the WorldCore version 2013-11-19 19:55:04 +11:00
Matt Caughey
d86912e96f Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2013-11-19 03:07:32 -05:00
Matt Caughey
b319f772a0 Changed default biomes to generate in config 2013-11-19 03:07:25 -05:00
Adubbz
fdbba68ef7 Forgot to remove debug stuff 2013-11-19 18:43:46 +11:00
Adubbz
22b9a3bfe6 Time to use the "Derpy Forstride" Spray! 2013-11-19 17:58:48 +11:00
Matt Caughey
345d1c8869 Tweaks to the Wasteland biome 2013-11-18 21:48:59 -05:00
Adubbz
ca3a907507 Merge pull request #131 from Vexatos/master
Updated de_DE.lang
2013-11-18 10:59:48 -08:00
Vexatos
fd2aa70401 Updated de_DE.lang 2013-11-18 18:01:12 +01:00
Matt Caughey
d749355ed5 Fixed Pixie spawns (I think) 2013-11-17 04:17:29 -05:00
Matt Caughey
6659421f32 Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty 2013-11-17 03:44:50 -05:00
Adubbz
fcb3964149 Amongst other things, added Pixie Jars and prevented Poison and Spring Water from generating in Origin Valley, the Promised Land and the Nether 2013-11-17 19:05:11 +11:00
Matt Caughey
15f0bd2f98 Added pixie trail particles that keep crashing
Prevented underground liquid poison/spring water lakes from generating in the Origin Valley, Nether, and Promised Land

Nothing happened here...
2013-11-17 17:43:11 +11:00
Aaron Gauntlett
fcc542599e Fixed pixie placement 2013-11-17 17:28:54 +11:00
Matt Caughey
7f2cea1927 Added Pixie Jars 2013-11-17 00:50:30 -05:00
Matt Caughey
617413b0bc Made Ambrosia crafting recipe use pixie dust instead of dandelions 2013-11-16 23:39:01 -05:00
Matt Caughey
39e33ad014 Fixed achievement bug (I think) 2013-11-16 21:21:20 -05:00
Matt Caughey
08d1d7b934 Prevented underground liquid poison/spring water lakes from generating in the Origin Valley, Nether, and Promised Land 2013-11-16 20:54:14 -05:00
Matt Caughey
a9558b2948 Added pixie trail particles that keep crashing 2013-11-16 20:47:48 -05:00
Adubbz
73e4abdb25 Tweaked magic leaves 2013-11-17 12:18:19 +11:00
Adubbz
640b3c5935 Added the awesomest magic particles ever 2013-11-17 11:30:34 +11:00
Matt Caughey
b20f108efb Made pixies "glow" 2013-11-16 17:40:49 -05:00
Matt Caughey
5f3eedd795 Tried to add particles for magic leaves 2013-11-16 17:13:40 -05:00
Adubbz
ab6272dcb2 Merge pull request #125 from VeryBigBro/patch-3
Update ru_RU.lang
2013-11-16 14:10:46 -08:00
Anton
8b9ad435ed Update ru_RU.lang 2013-11-16 16:08:04 +03:00
Matt Caughey
3598585ade Finished adding Pixies 2013-11-16 07:50:29 -05:00
Matt Caughey
a289ac8249 Added Pixie model and texture 2013-11-16 06:23:07 -05:00
Matt Caughey
1d1b989ae4 Tweaked some biome heights 2013-11-16 01:20:57 -05:00
Matt Caughey
7b18c9f229 Fixed "Achivements O' Plenty" achievement 2013-11-15 23:22:21 -05:00
Matt Caughey
1e34a1a45e Achievement tweaks 2013-11-15 22:10:30 -05:00
Adubbz
72680bd569 Update build.xml 2013-11-16 13:59:30 +11:00
Matt Caughey
7fae591d3e Made empty jars able to scoop up honey 2013-11-15 20:46:21 -05:00
Adubbz
3931a4a29e Fixed a bug with colorised leaves 2013-11-16 12:45:36 +11:00