WayofTime
04dcd073ad
Commit
2014-11-01 08:26:41 -04:00
WayofTime
207af72c93
Merge pull request #139 from Arcaratus/master
...
Cleaned up base mod file imports :P
2014-11-01 08:20:59 -04:00
Arcaratus
62388afdd3
Cleaned up base mod file imports :P
2014-10-31 21:32:08 -04:00
Arcaratus
5794659ecd
Update AlchemicalWizardry.java
2014-10-31 21:27:47 -04:00
WayofTime
19d050c398
Merge pull request #138 from TehNut/master
...
Update buildscripts, re-add models that went missing, update mcmod.info
2014-10-31 20:55:27 -04:00
TehNut
2f9384220a
Update buildscripts, re-add things that went missing, update mcmod.info
2014-10-31 17:50:25 -07:00
WayofTime
32946aca68
Moment of truth!
2014-10-31 18:07:43 -04:00
WayofTime
986ddb5d18
Hope this works
2014-10-31 18:05:33 -04:00
WayofTime
72a8f0ccdb
More stuff
2014-10-31 18:01:31 -04:00
WayofTime
1b7ee18816
Proper adding of gitignore - we'll see how this goes
2014-10-31 17:58:24 -04:00
WayofTime
ecf0a7912e
Adding gitignore
2014-10-31 17:54:59 -04:00
WayofTime
a2b006105e
Testing the creation of hell
2014-10-31 17:35:30 -04:00
WayofTime
796e75b1f9
Updating build scripts
2014-10-31 17:29:51 -04:00
WayofTime
4e9ce6964b
Merge pull request #137 from Tombenpotter/master
...
Added method to teleport entities across dimensions
2014-10-31 15:33:36 -04:00
WayofTime
e6fdd9f413
Merge pull request #126 from Alex-hawks/patch-1
...
Add overload of syphonAndDamageFromNetwork that takes a String
2014-10-31 15:33:09 -04:00
WayofTime
bb412ded92
Merge branch 'master' of https://github.com/WayofTime/BloodMagic
2014-10-31 15:32:16 -04:00
WayofTime
ab56e44480
Bunch of stuff required for Demon Invasion hoards
2014-10-31 15:31:56 -04:00
WayofTime
6998c43d59
Merge pull request #132 from qianzha/patch-7
...
Update zh_TW.lang(v1.2.0b)
2014-10-31 15:31:27 -04:00
WayofTime
575bd6ce74
Merge pull request #131 from qianzha/patch-6
...
Update zh_CN.lang (v1.2.0b)
2014-10-31 15:31:20 -04:00
Tombenpotter
e1c31e995c
Added method to teleport entities across dimensions
2014-10-31 17:38:32 +01:00
qianzha
7ff57e1f5d
Update zh_TW.lang
2014-10-27 20:22:37 +08:00
qianzha
67247c362c
Update zh_CN.lang
2014-10-27 20:21:19 +08:00
Alex
49ccf2a36e
Add overload of syphonAndDamageFromNetwork that takes a String
...
Accepts a String instead of an ItemStack, as I have just encountered a situation where I have access to the Owner's name, but not the ItemStack being used
2014-10-23 10:17:57 +08:00
WayofTime
dc1357739b
Fix to Full Stomach ritual, adding new system for summoning registry
2014-10-19 19:34:51 -04:00
WayofTime
3360a4d85c
Merge pull request #121 from nalimleinad/master
...
Create cs_CZ.lang
2014-10-19 19:28:22 -04:00
WayofTime
64644cda8a
Merge pull request #122 from qianzha/patch-5
...
Update zh_CN.lang(v1.2.0)
2014-10-19 19:28:14 -04:00
qianzha
cb96595e9b
Update zh_CN.lang(v1.2.0)
2014-10-19 13:17:21 +08:00
nalimleinad
78f3f06963
Create cs_CZ.lang
2014-10-17 19:52:36 +02:00
WayofTime
36a4174c36
Merge pull request #120 from MineMaarten/patch-1
...
Avoided potential crash when Botania isn't installed.
2014-10-17 12:41:37 -04:00
MineMaarten
03f03f1ad3
Avoided potential crash when Botania isn't installed.
2014-10-17 18:37:02 +02:00
WayofTime
f7b552a3c7
Fix for BM's Whirlwind buff making Botania useless (<3)
2014-10-17 12:23:08 -04:00
WayofTime
52acccaad6
Fix for Aura of Expulsion
2014-10-17 10:22:12 -04:00
WayofTime
428a618eaf
Merge pull request #119 from joshiejack/master
...
MT3 Support. And some NEI Adjustments.
2014-10-16 07:22:53 -04:00
WayofTime
5f9089daa2
Merge pull request #114 from Adaptivity/Update
...
Updated localizations
2014-10-16 07:20:26 -04:00
joshiejack
d0e974ddef
Fix @WayofTime using the shaped/shapeless in the joshie folder, when he should be using the ones in the api folder.
...
Repackage the NEI stuff to the main folder, I was being egotistical.
Also Includes @Tonius changes for adding a recipe button to the alchemical chemistry set for the nei handler.
And adds some checks, to the recipes, as sometimes they crash when adding/removing any.
2014-10-16 05:27:37 +01:00
joshiejack
772bcf1ee6
Add MineTweaker 3 Integration.
2014-10-16 05:26:15 +01:00
WayofTime
25bc226994
Merge pull request #116 from Tombenpotter/master
...
Anti-comments sweep!
2014-10-15 17:21:27 -04:00
Tombenpotter
dea1f87078
Anti-comments sweep!
2014-10-13 22:33:20 +02:00
WayofTime
e6a10f3f06
Final 1.2.0 push!
2014-10-13 12:25:40 -04:00
Adaptivity
86d8cb75bd
Update langs
2014-10-13 19:22:43 +04:00
WayofTime
3d6d7bcdd6
Almost ready for final 1.2.0 push
2014-10-13 10:33:43 -04:00
WayofTime
4a1f13d988
Merge pull request #82 from 61352151511/master
...
Entity localizations
2014-10-09 07:55:12 -04:00
WayofTime
a544ce0e77
Merge pull request #85 from qianzha/patch-4
...
Update zh_TW.lang
2014-10-09 07:55:03 -04:00
WayofTime
028e5aa9c0
Merge pull request #110 from berknam/master
...
Implemented "Shift + Left Click" for ItemDiviner to get previous Ritual
2014-10-09 07:51:06 -04:00
WayofTime
2e544a2b4e
Merge pull request #105 from MMKP/master
...
Korean translation
2014-10-09 07:50:49 -04:00
WayofTime
c9b25458ef
Merge pull request #109 from MSourceCoded/master
...
Compacted Enchantment Checking
2014-10-09 07:49:55 -04:00
WayofTime
1d99b70f14
Pushing before merging
2014-10-09 07:48:45 -04:00
Berknam
f7026a0800
Implemented "Shift + Left Click" for ItemDiviner to get previous Ritual
2014-10-09 00:17:13 +01:00
MSourceCoded
ed7850e13d
Migrated tool enchantment checks to the EnchantmentHelper as opposed to crawling the NBT compound
2014-10-09 04:15:07 +08:00
[MMKP]Puyo061
fc56efc807
Update ko_KR.lang
2014-10-04 11:30:36 +09:00
