Commit graph

2358 commits

Author SHA1 Message Date
WayofTime 96930fc47a Getting ready for release candidate 2014-07-10 20:52:05 -04:00
WayofTime 084e3dd348 Updating the finished tool paradigm 2014-07-06 08:03:22 -04:00
WayofTime cabc296b21 1.7.10 commit of I-still-can't-do-any-branches 2014-06-27 19:43:09 -04:00
WayofTime 6aec0a87ea Refixing Tool paradigm and adding some more stuff to the Encampment 2014-06-25 19:28:51 -04:00
WayofTime cce90ce8fd File creation and first crack at default .zip folder 2014-06-24 21:08:29 -04:00
WayofTime 74206f1dd9 Merge pull request #44 from Vexatos/patch-4
Updated de_DE.lang (Take 2)
2014-06-22 20:53:06 -04:00
WayofTime 896810ad59 New Building on da Block! 2014-06-22 20:51:02 -04:00
Vexatos 845ef06faa Updated de_DE.lang (Take 2) 2014-06-22 12:32:45 +02:00
WayofTime 126a38c30c Removing/moving file - And more work on roads (earlier commit) 2014-06-21 18:53:24 -04:00
WayofTime 618c308e0c Merge pull request #13 from sb023612/master
Create zh_CN.lang
2014-06-21 18:50:22 -04:00
WayofTime 161c7f7ff7 Merge pull request #19 from Vexatos/patch-2
Update de_DE.lang
2014-06-21 18:50:12 -04:00
WayofTime b6591ad5d7 Merge pull request #41 from Pokefenn/master
Added in IBloodAltar and fixed a few derpy things
2014-06-21 18:48:52 -04:00
WayofTime a9c857bbcb New commit 2014-06-21 18:47:00 -04:00
WayofTime 184f4bb85d Merge pull request #39 from joshiejack/master
Fixed Obfuscated Names
2014-06-18 18:28:55 -04:00
WayofTime ca61e8f233 Merge pull request #42 from MatAlcDev/patch-1
Register the TESpecialContainer.
2014-06-18 18:20:47 -04:00
MatAlcDev 4f153e55c5 Register the TESpecialContainer.
http://puu.sh/9ziOP/045c89b1db.png, this line should fix that crash.
2014-06-18 15:31:46 -03:00
Fenn 3a8c6e8418 Added in IBloodAltar and fixed a few derpy things 2014-06-17 15:51:58 +01:00
joshiejack 3412ea5029 Fixed Obfuscated Names
Fixing the obfuscated names... Was still using the names from 1.6... Fixes the tooltips not working in normal minecraft for the drain/consume.
2014-06-15 04:23:47 +01:00
WayofTime 259699dfcf Merge pull request #33 from joshiejack/master
Updated Alchemy Handler + BloodOrbRecipe Addition
2014-06-10 18:43:42 -04:00
WayofTime 82f947b31b Merge pull request #31 from joshiejack/patch-3
Fixing potential arrayoutofbounds exception
2014-06-10 18:43:01 -04:00
joshiejack c7bca1e984 Blood Orb recipes use the new OrbRecipeHandler, so you can see the minimum blood orb, and all greater will work in replacement. Also fixed Alchemy handler to use IBloodOrb system. 2014-06-06 16:16:45 +01:00
WayofTime 761d0993b1 This is a test commit to try the new repository method 2014-06-02 17:51:00 -04:00
WayofTime ac943e9d38 Joshie comment! 2014-06-02 15:16:36 -04:00
joshiejack 23005b3cd4 Fixing potential arrayoutofbounds exception
I don't care if someone sets a recipe with an orb level greater than the max, that's their fault, but if they accidentally set one to 'tier 0', i don't think nei should crash.
2014-06-02 11:18:17 +01:00
Vexatos b2113e08cd Update de_DE.lang 2014-05-17 13:35:18 +02:00
WayofTime 1c0deadfc6 1.0.1d push 2014-05-04 18:11:09 -04:00
WayofTime e13818e2da Small change 2014-04-27 08:38:50 -04:00
sb023612 3278d8f8cb Create zh_CN.lang 2014-04-27 01:05:46 +08:00
WayofTime 4070e560d1 1.0.2 push 2014-04-26 10:49:34 -04:00
WayofTime 6e4de4f6e9 Work on a seeecret project 2014-04-17 07:06:28 -04:00
WayofTime 97b90eaf63 Final push of 1.0.1! 2014-04-07 07:27:04 -04:00
WayofTime 9dc8a57a2d Updating 1.7.2 repo 2014-04-05 16:00:08 -04:00
WayofTime c9a38c4c10 Merge pull request #11 from Vexatos/patch-1
Created de_DE.lang and fixed a few typos
2014-04-04 07:37:17 -04:00
WayofTime 446b98219e API at 99% 2014-04-04 07:36:41 -04:00
Vexatos 7cb1b29685 Create de_DE.lang 2014-04-04 11:59:40 +02:00
Vexatos 219ad37678 Why don't you Latin? 2014-04-04 11:49:29 +02:00
Vexatos 888fb9a6d5 Update en_US.lang 2014-04-04 11:39:37 +02:00
WayofTime 30e18429ec Setting up Binding recipe registry - 50% 2014-04-03 06:53:45 -04:00
WayofTime dd95523597 Alchemy Set Registry 2014-04-02 19:17:57 -04:00
WayofTime d229da6272 API fun 2014-04-02 19:07:11 -04:00
WayofTime a1ca81423b Late git push is late 2014-04-01 20:29:02 -04:00
WayofTime b962ede72d v1.0.0 finilization 2014-03-22 17:15:58 -04:00
WayofTime 4394ba4541 Spells spells, did I mention spells? 2014-03-19 20:47:14 -04:00
WayofTime 0dd830480c Merge pull request #10 from joshiejack/patch-2
Alchemy handler 'bug' fix :P
2014-03-19 06:19:23 -04:00
joshiejack 31cd32f21c Alchemy handler 'bug' fix :P
Just added a break so that the for loop when going through the items when searching uses, exits when it has found the ingredient. This fixes the bug where searching usages on an item that's used up more than once in a recipe results in multiple copies of the recipe.
2014-03-19 02:59:45 +00:00
WayofTime 5403ad5a80 Merge pull request #9 from joshiejack/master
Blood Altar NEI Integration
2014-03-18 21:52:04 -04:00
WayofTime b9263ee174 Quick update 2014-03-18 21:50:57 -04:00
joshiejack 2d5cafc185 Blood Altar NEI Integration 2014-03-19 01:39:49 +00:00
joshiejack 00349f802d Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2014-03-19 01:35:42 +00:00
WayofTime be38ab1076 Added in a few more alchemy stuff 2014-03-16 15:11:09 -04:00