Commit graph

2379 commits

Author SHA1 Message Date
ted
8a7d5f63b4 Merge pull request #9 from Adubbz/master
configurable achievements
2013-03-31 23:46:02 -07:00
Adubbz
22c9b3d3cc Take 2 on fixing items all being swords 2013-04-01 17:34:28 +11:00
Adubbz
52d594a66b Fixed ancient staff broken commit 2013-04-01 17:24:04 +11:00
Adubbz
b33fb45960 Fixed the configurable achievements commit which was stuffed up by conflicting PRs (Derp on my part) 2013-04-01 17:04:22 +11:00
Adubbz
a23a32cedd Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-04-01 16:57:14 +11:00
ted
e3194e06eb Merge pull request #7 from Adubbz/MiscFixes
Misc fixes
2013-03-31 22:42:14 -07:00
Adubbz
46a4b16458 Revert "Made achievements configurable"
This reverts commit d34f691e0a.
2013-04-01 16:16:07 +11:00
Adubbz
4ccb9c4d29 Revert "Fixed all the tools being swords, fixed the duplicate messages on creation of the Promised Lands portal as well as fancying it up :) Also fixed a bug where you could get an endless supply of endstone by recreating the portal."
This reverts commit 1223145994.
2013-04-01 16:11:03 +11:00
Adubbz
d24610896e Revert "Revert "Fixed all the tools being swords, fixed the duplicate messages on creation of the Promised Lands portal as well as fancying it up :) Also fixed a bug where you could get an endless supply of endstone by recreating the portal.""
This reverts commit 9f8c33526e.
2013-04-01 16:10:09 +11:00
Adubbz
9f8c33526e Revert "Fixed all the tools being swords, fixed the duplicate messages on creation of the Promised Lands portal as well as fancying it up :) Also fixed a bug where you could get an endless supply of endstone by recreating the portal."
This reverts commit 1223145994.
2013-04-01 16:09:50 +11:00
Adubbz
1223145994 Fixed all the tools being swords, fixed the duplicate messages on creation of the Promised Lands portal as well as fancying it up :) Also fixed a bug where you could get an endless supply of endstone by recreating the portal. 2013-04-01 16:07:44 +11:00
Adubbz
d34f691e0a Made achievements configurable 2013-04-01 08:58:42 +11:00
ted
2a8cf85f51 Merge pull request #3 from Adubbz/master
added Ore Dictionary
2013-03-31 04:34:24 -07:00
Adubbz
53cb24154b Merge branch 'master' of https://github.com/ted80/BiomesOPlenty 2013-03-31 19:52:16 +11:00
ted80-PC
b0cceee5ab fixed some bugs 2013-03-31 09:44:17 +02:00
Adubbz
268f2d87f1 Merge branch 'master' of https://github.com/Adubbz/BiomesOPlenty
Conflicts:
	src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java
2013-03-31 18:42:30 +11:00
Adubbz
1c57b35666 Switched to using the OreDictionary rather than a lot of unecessary recipes 2013-03-31 18:34:01 +11:00
ted
b9717f2aad Update README.md 2013-03-31 10:16:43 +03:00
Adubbz
7b7d0af96f Cleaning up 2013-03-31 17:29:43 +11:00
Adubbz
490a7d75a1 Merge branch 'master' of https://github.com/ted80/BiomesOPlenty
Conflicts:
	src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java
	src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java
2013-03-31 16:51:01 +11:00
ted
d1f496bd1b Update README.md 2013-03-30 18:17:19 +01:00
ted
ba66b71b3e Create README.md 2013-03-30 18:16:52 +01:00
ted80-PC
f813c30392 updating to 1.5.1 (2/2) 2013-03-30 18:14:03 +01:00
ted80-PC
2ca69bb4ae updating to 1.5.1 (1/2) 2013-03-30 11:54:53 +01:00
Adubbz
e83c44d42a Gave most of the blocks their appropriate names (with the exception of the odd four which i can't find what they are for). Hopefully didn't get too many mixed up 2013-03-30 20:17:14 +11:00
Adubbz
1678e12e6e Forgot to add the rosester file :S 2013-03-30 16:36:55 +11:00
Adubbz
72a92cadd3 Started work on fixing the textures. Hopefully this helps :) 2013-03-30 16:31:49 +11:00
ted80-PC
6c9f7b2039 uploaded old source code 2013-03-28 20:03:53 +01:00
ted80-PC
98e219d12a hi there world :) 2013-03-28 19:45:23 +01:00