upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-10-25 20:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,251 Commits 5 Branches 114 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Katrina Swales 3388dd2296 Merge pull request #876 from Kamesuta/1.7-final 
Infinite loop problem from Bedrock Dimension in SkyBlock.
 2017-07-24 21:01:39 +01: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
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
Katrina Swales 9ad933874a Merge pull request #797 from Ghostlyr/patch-3 
Typo
 2015-10-30 20:28:49 +00:00
Katrina Swales 51deb58f78 Merge pull request #790 from Ghostlyr/patch-1 
Update ru_RU.lang
 2015-10-17 12:50:12 +01:00
Katrina Swales 3a68e7935c Merge pull request #789 from Ghostlyr/patch-2 
Update ru_RU.lang
 2015-10-16 11:18:16 +01: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
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
Katrina Swales f578198479 Added paving slabs, and stairs, of travel 2015-04-16 21:23:47 +02:00
Katrina Swales ecda071df8 Fixed #719 and updated libs 2015-04-13 23:28:45 +02:00
Katrina Swales 547df8eff0 Fixes #714 (should do, not tested) 2015-04-04 21:00:06 +02:00
Katrina Swales 55a2fa4e7a Fixed #691 Made sure the light slowly disapears from the world 2015-03-30 06:50:26 +02:00
Katrina Swales ecc0ad66dc Fixed #705 - Trasvector Interface now works fully with RF devices again 2015-03-30 03:17:32 +02:00
Katrina Swales f5f0b38d48 Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop 2015-03-30 02:13:03 +02:00
Katrina Swales ec26bfee98 updated APIs and fixed #706 2015-03-30 02:10:53 +02:00
Katrina Swales d2da2996a3 Merge pull request #704 from Meegooo/patch-1 
Fix enderchest dupe bug
 2015-03-26 14:38:05 +01:00
Katrina Swales 7fb1ea7214 Fixes #696 2015-03-18 17:06:37 +01:00
Katrina Swales 2bcc83bc87 Removed some tt changes to see if fixes 2015-03-01 00:32:15 +01:00
Katrina Swales 9f002fc743 Fixed #674 2015-02-21 16:24:07 +01:00
Katrina Swales 486567a9cb Hopefully fixed #663 2015-02-18 00:09:15 +01:00
Katrina Swales 09eb7c9ce8 Fixes #520 2015-02-17 23:56:57 +01:00
Katrina Swales 0cf7066b7e Fixed #655 2015-02-05 22:59:31 +01:00
Katrina Swales 34c846b475 Fixed #593 Fixed #521 2015-02-04 14:13:44 +01:00
Katrina Swales 7f466627c1 Updated Computer Craft API 2015-02-04 12:58:20 +01:00
Katrina Swales e0c3e3ad07 Disabled imbued fire crafting when config disabled, and added some logging 2015-02-04 02:18:18 +01:00
Katrina Swales b830f87b23 Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop 2015-02-01 15:22:42 +01:00
Katrina Swales 4683b995a8 Fixed #517 2015-02-01 15:22:09 +01:00
Katrina Swales f812e74fba Merge pull request #649 from DrQwertySilence/develop 
Fixed ItemFocusSmelt sound:
 2015-02-01 02:38:58 +01:00
Katrina Swales 3419f42318 Unerfed XP focus a bit 2015-01-31 18:26:14 +01:00
Katrina Swales c1d38a434b Fixed #602 2015-01-31 17:26:44 +01:00
Katrina Swales 7b62b0d478 Fixes #583 2015-01-31 17:04:37 +01:00
Katrina Swales 321775cb93 Fixed #636 . is a bit hacky right now, but Should work 2015-01-31 15:31:42 +01:00
Katrina Swales 7a196a06ca Fixed previous PR 2015-01-31 14:34:18 +01:00
Katrina Swales f15c7ca364 Merge pull request #647 from Adaptivity/vanillalocalizationhandler 
Kill language handler
 2015-01-31 14:16:03 +01:00
Katrina Swales cb2855baac Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop 2015-01-31 01:19:04 +01:00
Katrina Swales 9572fcdd01 Added new blacklist objects for mods Fixed #638 2015-01-31 01:15:35 +01:00
Katrina Swales 3d8de57312 Merge pull request #646 from DrQwertySilence/develop 
Fixed ShadowBeam particle:
 2015-01-30 23:35:47 +01:00
Katrina Swales 1a7f11bace Removed hardcoded apis, and moved some changes accidentally added to Master back to develop 2015-01-30 21:24:04 +01:00
Katrina Swales 836bae42ad Merge pull request #629 from crafteverywhere/patch-7 
Fixed some mistakes in Chinese language file.
 2015-01-28 22:21:00 +01:00
Katrina Swales 6f534bb52a Fixed #575 2014-12-12 13:29:21 +00:00
Katrina Swales 504adabd0e Fixed #589 2014-12-12 00:34:29 +00:00
Katrina Swales 05c2f0bc45 Fixed missing changes 2014-12-12 00:30:17 +00:00
Katrina Swales 8fc69e8338 Moved potion ids to config 2014-12-12 00:28:16 +00:00
Katrina Swales 2b35134bad Removed buildcraft api to fix issues 2014-12-04 11:28:28 +00:00
Katrina Swales 8d91096c4d Test if this fixes 2014-11-25 19:14:48 +00:00
Katrina Swales f477187ede Will this work? 2014-11-25 18:44:16 +00:00
Katrina Swales f42f3d3685 Cleaned up some stuff ((accidentally) fixed up textures, started on focii, and cleaned gradle a bit 2014-11-19 23:16:54 +00:00
Katrina Swales 6622892f0e Fixed texture problem 2014-11-18 19:13:14 +00:00
Katrina Swales 70e3c09600 Thaumcraft beta changes 2014-11-18 18:08:57 +00:00
Katrina Swales 6365e45ac8 Fixed AE API to stop crash with RV1 : Warning only compatible with AE2 rv1 2014-11-16 17:21:46 +00:00
Katrina Swales cf600636bf Fixed other CC issue 2014-11-15 11:05:11 +00:00
Katrina Swales e21101d635 Merge pull request #533 from Keridos/develop 
fixing crashes with thaumcraft 4.2.1.x due to some changes in TC API
 2014-10-20 03:54:28 +01:00
nekosune a0fc1aee13 Removed potential false drop/dupe bug 2014-09-29 23:41:41 +01:00
nekosune d1f139edcf Readded block drops 2014-09-29 23:38:43 +01:00
Katrina Swales c3dc9d1b1f Fixed minor compile error 2014-09-27 23:47:08 +01:00
Katrina Swales 6f3dc7f490 See if this fixes PART of #514. Full fix will need storing itemstacks, not blocks 2014-09-27 23:33:59 +01:00
Katrina Swales 3cbd4aafb1 Attempt at fixing #514 2014-09-26 22:19:49 +01:00
Katrina Swales c207c9ca97 Fixed build 2014-09-20 11:08:05 +01:00
Katrina Swales 38945de076 Minor alteration to previous fix 2014-09-20 09:44:39 +01:00
Katrina Swales 7b527593b7 Fixes #496 Or should 2014-09-20 09:32:29 +01:00
Katrina Swales 5a2eacaff1 Fixed Version Checker pattern 
Fixed
 2014-09-17 21:18:18 +01:00
nekosune 0e7ef4c856 Fixes #501 with minor change ... 2014-09-16 22:28:45 +01:00
nekosune 662f03c4f3 Minor changes and fixed #499 2014-09-15 02:52:01 +01:00
Katrina Swales 2e5cdaf2ac Merge pull request #485 from crafteverywhere/patch-6 
Update zh_CN.lang
 2014-09-08 18:41:56 +01:00
nekosune f9aedca248 Added null check. Fixes #490 2014-09-08 18:25:36 +01:00
nekosune 3dfda37c58 MLTT: Gradle is Magic 2014-09-07 16:38:13 +01:00
nekosune 05a02e0521 Minor change 2014-09-07 15:08:42 +01:00
nekosune 260cff2f38 Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop 2014-09-07 15:02:09 +01:00