Commit Graph
2030 Commits
Author SHA1 Message Date
Dream-Master 717533534d spelling fix 2017-04-08 21:15:47 +10:00
Dream-Master a6568edb96 fix the slab recipe 2017-04-08 21:15:43 +10:00
KryptonCaptain f259ae670b Effect restore
Restored essentia particle effect during enchanting
2017-04-08 21:14:18 +10:00
KryptonCaptain 169ee31b8e Update gradle
Removed a line causing compat crash with IMC
2016-12-01 02:31:15 +11:00
Katrina Swales 34aee427c7 Update build.gradle 2016-11-16 20:21:18 +00:00
Katrina Swales 482bffabce Update build.gradle 2016-11-16 20:16:15 +00:00
Katrina Swales 5035d2fffd Update build.gradle 2016-11-16 20:12:36 +00:00
nekosune 84788dcf54 Spelling for #863 2016-08-28 22:23:28 +01:00
nekosune c7fe97c48d Fixed #863 2016-08-28 22:11:11 +01:00
Katrina Swales 58d57a02e5 Fixed OTHER issue someone added to #843 2016-08-28 15:37:08 +01:00
Katrina Swales 085c9b553e Fixed #843 2016-08-28 15:33:26 +01:00
Katrina Swales fc6329335d Fixed #857 2016-08-14 20:45:14 +01:00
Katrina Swales ddf1569f24 Fixed #851 2016-08-14 19:24:55 +01:00
Katrina Swales f38a73197c Fixed #852 2016-08-14 18:57:42 +01:00
Katrina Swales cca69d2e7a Fixed api error 2016-08-14 17:59:25 +01:00
Katrina Swales 3a2df62fae Merge branch '1.7-final' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into 1.7-final 2016-08-14 17:26:26 +01:00
Katrina Swales 90dc246e3a Fixed #859 2016-08-14 17:26:11 +01:00
Katrina Swales fe9a84e60e Fixed #860 2016-07-03 21:39:52 +01:00
Katrina Swales d6ea0a3972 latest version of forge 2016-06-11 17:53:00 +01:00
Katrina Swales a73d38de64 Fixed #853 2016-06-11 16:42:52 +01:00
Katrina Swales 7cdbfb8254 Merge branch '1.7-final' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into 1.7-final 2016-06-10 18:06:06 +01:00
Katrina Swales 525cf467dc Fixed #824 amongst other things 2016-06-10 18:04:00 +01:00
Katrina Swales 578f6fc868 Merge pull request #828 from Sunconure11/patch-1
Fixed a minor typo
2016-02-20 22:40:22 +00:00
nekosune 08341ebd60 Fixed #835 TT thought everything was infused seeds on harvest 2016-02-08 22:49:00 +00:00
nekosune 417e86a4ca FIxed #833, stopped TT Infused seeds planter thinking it knew what to do with vanilla 2016-02-08 15:29:28 +00:00
nekosune 5874de06d7 Fixed #829 Prevented Dislocator from moving entities created upon block movement 2016-02-04 15:35:19 +00:00
nekosune f3a167dc8a Fixed #827 by adding EnderIO custom planter for infused seeds 2016-02-03 12:10:41 +00:00
Joseph Caleb Jones f998506f9c Fixed a minor typo
If this is the right branch, anyways.
2016-01-25 20:48:00 -05:00
Katrina Swales 81d9fe3d97 Fixed Talisman breaking - #805 2015-12-02 17:38:01 +00:00
Katrina Swales 981397cf3c Merge remote-tracking branch 'origin/1.7-final' into 1.7-final 2015-12-02 16:51:03 +00:00
Katrina Swales fd45ef3f92 One part of #805 fixed 2015-12-02 16:50:47 +00:00
Katrina Swales 1aa642b65b Merge pull request #810 from digger5/1.7-final
Second try at the research key for minetweaker.
2015-11-30 18:03:44 +00:00
Digger5 087202247a Second try at the research key for minetweaker. 2015-11-30 18:13:18 +01:00
Katrina Swales 9ad933874a Merge pull request #797 from Ghostlyr/patch-3
Typo
2015-10-30 20:28:49 +00:00
Ghostlyr 6d6a847536 Typo 2015-10-31 02:27:16 +06:00
Katrina Swales 51deb58f78 Merge pull request #790 from Ghostlyr/patch-1
Update ru_RU.lang
2015-10-17 12:50:12 +01:00
Ghostlyr 75a7d55411 Update ru_RU.lang 2015-10-17 14:35:16 +06:00
Katrina Swales 3a68e7935c Merge pull request #789 from Ghostlyr/patch-2
Update ru_RU.lang
2015-10-16 11:18:16 +01:00
Ghostlyr 3d9f996d99 Update ru_RU.lang 2015-10-13 23:07:27 +06:00
nekosune f4060274d5 Added blacklist to account for #784, will not fix but allows other end to add their block to blacklist 2015-10-03 15:41:19 +01:00
nekosune 329961bfed Fixed #787 2015-10-03 15:05:55 +01:00
Katrina Swales 7ff8a7a40e Fixed an infused grain crash 2015-06-25 01:47:00 +01:00
Katrina Swales 35340b2fcd Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop 2015-05-17 14:28:47 +01:00
Katrina Swales b3c401f718 Fixed incompatibility with HEE or any other mod that extends vanilla entities 2015-05-17 14:10:29 +01:00
Katrina Swales 9b9f49675b Merge pull request #731 from TheVizzy/develop
Small Ru Fix
2015-04-28 22:49:53 +02:00
MrVizzyTM e03466fcc2 Small Ru Fix 2015-04-29 00:59:14 +05:00
Katrina Swales fd92c885e8 Merge pull request #729 from bakaxyf/patch-1
Update zh_CN.lang
2015-04-23 17:39:11 +02:00
Katrina Swales 25811bc207 Update BlockTravelStairs.java 2015-04-23 01:32:26 +02:00
Katrina Swales 753cfc0140 Update BlockTravelSlab.java 2015-04-23 01:31:59 +02:00
bakaxyf f07d933e35 Update zh_CN.lang 2015-04-22 22:59:53 +08:00