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
Vasco Lavos 75c41b748c Merge pull request #354 from jinwoo829/patch-3 
Create ko_KR.lang
 2014-05-03 12:41:23 +01:00
Vasco Lavos 6dbcca4da0 Merge pull request #355 from jinwoo829/patch-4 
Register ko_KR
 2014-05-03 12:40:39 +01:00
Vasco Lavos dcfcc6adec Merge pull request #282 from Mexahoid/patch-4 
Update ru_RU.lang
 2014-03-12 13:35:39 +00:00
Vasco Lavos e927fb48bc Merge pull request #279 from Vexatos/patch-4 
Update de_DE.lang
 2014-03-11 13:39:47 +00:00
Vasco Lavos 4b8405eef2 This ought to fix the issues with BetterStorage. 2014-02-28 22:57:15 +00:00
Vasco Lavos d36648c61d Merge pull request #228 from Mexahoid/patch-3 
Update ru_RU.lang
 2014-02-23 10:36:51 +00:00
Vasco Lavos 63e15e46ba Merge pull request #217 from Vexatos/patch-4 
Update de_DE.lang
 2014-02-18 19:28:32 +00:00
Vasco Lavos 55e27853f2 Merge pull request #205 from Vexatos/patch-4 
Update de_DE.lang
 2014-02-14 17:24:10 +00:00
Vasco Lavos f3910119d5 Merge pull request #202 from Vexatos/patch-4 
Update de_DE.lang
 2014-02-09 14:15:05 +00:00
Vasco Lavos b7dcb80269 Merge pull request #184 from Vazkii/pixlepix-master 
Update to MineChem team's branch.
 2014-02-02 11:15:04 -08:00
Vasco Lavos 470968704b Update to MineChem team's branch. 2014-02-02 19:14:10 +00:00
Vasco Lavos 9abdff5b8e Merge pull request #181 from Mexahoid/patch-1 
Updated to new version.
 2014-01-31 04:08:26 -08:00
Vasco Lavos 9114119318 Build 70 (TC 4.1 beta), to fix an issue in forgecraft that's driving me insane. 2014-01-30 18:35:52 +00:00
Vasco Lavos 7a431fb683 Build 69 (TC 4.1 beta, for Forgecraft). Changes not commited to master branch, see a5bf3616a4a256f2f85ac7af977f376e46144d1e in TC4.1 2014-01-28 21:53:03 +00:00
Vasco Lavos c7abf87b22 Merge branch 'master' of https://github.com/Vazkii/ThaumicTinkerer 2014-01-28 17:28:58 +00:00
Vasco Lavos a71e02c7ac Build 68 (for theFlaxbeard) 2014-01-28 17:28:31 +00:00
Vasco Lavos d5caabf9e2 Merge pull request #180 from Flaxbeard/master 
Added a way to add enchantments to the Osmotic Enchanter, and space for new enchantments
 2014-01-23 08:04:42 -08:00
Vasco Lavos 92a4686059 Build 67. 2014-01-21 18:44:08 +00:00
Vasco Lavos eb2a4aaa40 Added config option to disable usage of copper (when present). 2014-01-21 18:37:46 +00:00
Vasco Lavos edd473bb12 Merge branch 'master' of https://github.com/Vazkii/ThaumicTinkerer 2014-01-21 18:26:37 +00:00
Vasco Lavos c28cbbfe44 Fixed the Celestial Recall focus not working. 2014-01-21 18:26:32 +00:00
Vasco Lavos ee4b0237ab Merge pull request #174 from wodkashorty/master 
Update de_DE.lang
 2014-01-17 09:53:38 -08:00
Vasco Lavos 5908e4c01e Merge pull request #170 from Vexatos/patch-4 
Shifted Ichorium tools in de_DE.lang
 2014-01-14 09:02:02 -08:00
Vasco Lavos 3c941b10cb Build 66. 2014-01-14 14:09:07 +00:00
Vasco Lavos 6e5b770f6c Fixed the server crash with the Shadowbeam Focus. 2014-01-14 14:02:25 +00:00
Vasco Lavos a1f9d72d1b Fixed a weird crash with the recall focus and right clicking it. 2014-01-14 14:00:46 +00:00
Vasco Lavos 5bb46221ae NO-OP sendContainerToPlayer for the TabletFakePlayer. Fixes #168 2014-01-14 13:56:48 +00:00
Vasco Lavos 188c25508c Build 65. 2014-01-12 15:19:39 +00:00
Vasco Lavos 4ddce1b717 Some mod foci now have a sorting key, should fix them not being able to be put in wands with F. 2014-01-12 15:11:01 +00:00
Vasco Lavos 6fa6ab6a5a Awakened Ichorium tools now change mode with shift-right click. 2014-01-12 15:08:46 +00:00
Vasco Lavos 622558b9d7 Build 64, for real this time. 2014-01-11 16:36:20 +00:00
Vasco Lavos a676adbb36 Build 64. 2014-01-11 16:20:04 +00:00
Vasco Lavos 309b0f44d8 Fixed the Celestial Gateway randomly opening GUIs for other players. 2014-01-11 16:01:31 +00:00
Vasco Lavos 83b8412855 Changed Slow Fall to not be appliable to Boots of the Horiziontal Shield. 2014-01-11 15:42:04 +00:00
Vasco Lavos 2b8a671613 Fixed flying status not resetting when the Ichorium Armor isn't removed. 2014-01-11 15:38:39 +00:00
Vasco Lavos 9d7179a0de Added Protoclay and Hyper. Nitor to the creative tab. 2014-01-11 15:35:31 +00:00
Vasco Lavos dcd8177b4f Merge branch 'master' of https://github.com/Vazkii/ThaumicTinkerer 2014-01-11 15:33:46 +00:00
Vasco Lavos 82c5188b2e Changed the Celestial Pearl recipe to make pairs. 2014-01-11 15:33:37 +00:00
Vasco Lavos b9c1bfa94e Merge pull request #167 from Vexatos/patch-4 
Update de_DE.lang
 2014-01-11 07:30:31 -08:00
Vasco Lavos db60eecd3f Moved the Shadowbeam focus' research to not clash with a research from Thaumic Exploration. 2014-01-11 15:29:38 +00:00
Vasco Lavos 562f6aad6e Some messing around with the XP drain focus' code to be more effecient. 2014-01-11 15:24:32 +00:00
Vasco Lavos 06722bffe0 Made the Celestial Network GUI way easier to navigate. 2014-01-11 15:06:20 +00:00
Vasco Lavos 598c04c60d Fixed Dimensional Shards being extremely common. 2014-01-11 14:37:01 +00:00
Vasco Lavos b298024a79 Readded the vis discount indicator to the Leggings' tooltip. 2014-01-11 14:36:08 +00:00
Vasco Lavos f2d2614562 Fix a crash with Easymode research and Lost research notes. 2014-01-11 14:32:13 +00:00
Vasco Lavos 79107fc49e Add a failsafe for worlds crashed with that same StackOverflow. 2014-01-11 14:29:15 +00:00
Vasco Lavos 9de0edfd25 Merge branch 'master' of https://github.com/Vazkii/ThaumicTinkerer 2014-01-11 14:27:00 +00:00
Vasco Lavos c43141bc33 Fixed a StackOverflow with camo blocks. 2014-01-11 14:26:22 +00:00
Vasco Lavos bac3fb78a7 Merge pull request #166 from Vexatos/master 
Updated de_DE.lang
 2014-01-11 06:19:09 -08:00
Vasco Lavos 3e4211adb9 Build 63. 2014-01-11 00:00:25 +00:00
Vasco Lavos 98a6c8ae6f Fixed the XP drain focus sometimes exceeding the max the wand can have. 2014-01-10 23:57:36 +00:00
Vasco Lavos 5336a68088 Fixed protoclay not having a config option. 2014-01-10 23:49:52 +00:00
Vasco Lavos 87c932ec8e Build 62. 2014-01-10 23:11:55 +00:00
Vasco Lavos 669de63e50 Fixed a server crash caused by the fix for a server crash. 2014-01-10 22:55:18 +00:00
Vasco Lavos 14293ab3f0 Fixed a server crash. 2014-01-10 22:50:23 +00:00
Vasco Lavos 7484c0dd79 Fixing textures, part 2. 2014-01-10 22:36:17 +00:00
Vasco Lavos 3d0b21d69b Fixing textures, part 1. 2014-01-10 22:34:21 +00:00
Vasco Lavos 68ad725a02 Build 61! 2014-01-10 22:06:51 +00:00
Vasco Lavos b92650d239 And a cleanup run, on the house. 2014-01-10 22:00:07 +00:00
Vasco Lavos 3bd9850179 Moved dimension IDs to a config. 2014-01-10 21:59:15 +00:00
Vasco Lavos ad27e9a9e6 Research + Recipe for the Recall Focus. 2014-01-10 21:56:00 +00:00
Vasco Lavos f6f030df73 Added the effect for the Recall Focus. 2014-01-10 21:43:58 +00:00
Vasco Lavos f15c9bae24 Add some things to the creative tab. 2014-01-10 21:27:59 +00:00
Vasco Lavos 4591dadd7a Starting work on the Wand Focus: Celestial Recall. 2014-01-10 21:27:20 +00:00
Vasco Lavos 20b61d5078 Added the research + recipes for the Celestial Gateway and Pearl. 2014-01-10 21:16:54 +00:00
Vasco Lavos 25ee8c952a Changed the gateway to respect order of listing. 2014-01-10 19:54:53 +00:00
Vasco Lavos e997f8ede0 Sync Celestial Network status on right click. 2014-01-10 19:44:48 +00:00
Vasco Lavos e982a4baeb Some polish on the Celestial Gateway. I think it's safe to call it done. 2014-01-10 19:43:15 +00:00
Vasco Lavos fe1a294e41 The Celestial Gateway is functional! 2014-01-10 19:31:29 +00:00
Vasco Lavos 24e628b609 Some more work on the Celestial Gateway... 2014-01-10 19:16:58 +00:00
Vasco Lavos d9af736740 Merge pull request #164 from DrummingFish/master 
Spelling/grammar fix
 2014-01-10 10:37:39 -08:00
Vasco Lavos 229016a8c0 Starting on the destination selection gui. 2014-01-10 18:37:14 +00:00
Vasco Lavos 6d0454e24c Added a "Allow incoming teleports" button to the gui. 2014-01-10 18:07:26 +00:00
Vasco Lavos 9316da6906 Celestial Gateway is now an Inventory. 2014-01-10 17:57:54 +00:00
Vasco Lavos 7e60086720 Added the Celestial Pearl and it's effect. It'll be part of the Celestial Gateway system. 2014-01-10 17:40:17 +00:00
Vasco Lavos 76517dba7e Cooler rotating cubes on the render. 2014-01-10 17:14:46 +00:00
Vasco Lavos 6fafd208ff New Render for the Celestial Gateway. Still does nothing... 2014-01-10 17:00:25 +00:00
Vasco Lavos 6b1f3a1122 Added the Celestial Gateway block. It does nothing, how cool. 2014-01-10 16:38:11 +00:00
Vasco Lavos db432ded46 Relocalize the XP Drain focus' tooltip. 2014-01-10 15:37:33 +00:00
Vasco Lavos a76da0b6a0 Merge pull request #160 from Qendivardo/ThaumicTinkerer-camo 
BlockCamo: Allow for directional blocks and biome coloring as camouflage.
 2014-01-10 07:27:06 -08:00
Vasco Lavos 41c32173e1 Added Easymode research config option. 2014-01-10 14:42:47 +00:00
Vasco Lavos 0df46d1594 Documented the option to turn off light in the Leggings. 2014-01-10 13:54:46 +00:00
Vasco Lavos f8d0cd759f Merge branch 'master' of https://github.com/Vazkii/ThaumicTinkerer 2014-01-10 09:48:49 +00:00
Vasco Lavos b844a39fa3 Added initial textures for the Celestial Network system. 2014-01-10 09:48:30 +00:00
Vasco Lavos 2bc9da3b6d Merge pull request #158 from Vexatos/patch-3 
Update de_DE.lang
 2014-01-10 01:03:53 -08:00
Vasco Lavos 52a5118fc2 Research + Recipe for the Protoclay. 2014-01-09 23:15:39 +00:00
Vasco Lavos a9e34ac653 Added Protoclay. 2014-01-09 22:36:16 +00:00
Vasco Lavos f0dfa401dc Merge pull request #157 from Vexatos/patch-3 
Update de_DE.lang
 2014-01-09 13:23:18 -08:00
Vasco Lavos 68c463a778 Merge pull request #156 from demon012/master 
Added build section for unix operating systems.
 2014-01-09 13:23:08 -08:00
Vasco Lavos a828edf8ce Added the new foci to the creative tab. 2014-01-09 19:07:45 +00:00
Vasco Lavos b42f543998 Research + Recipe for the XP Drain focus. 2014-01-09 19:07:08 +00:00
Vasco Lavos d13356e037 Increased the range on the Distortion Focus. 2014-01-09 18:45:57 +00:00
Vasco Lavos a62ecac0eb Implemented the Experience Drain focus. 2014-01-09 18:38:26 +00:00
Vasco Lavos b0b2cd9949 Starting on the XP Drain foci. RAINBOW FOCI :D 2014-01-09 17:56:04 +00:00
Vasco Lavos 949c516a0d Merge pull request #154 from Vexatos/master 
Added Shadowbeam Focus to de_DE.lang
 2014-01-09 09:47:07 -08:00
Vasco Lavos e5a3a8dd40 Etheral Platform Properties. 2014-01-09 17:37:52 +00:00
Vasco Lavos bc7f514ca5 Added a list of valid render types for the Camo Blocks. Closes #146 2014-01-09 17:30:02 +00:00
Vasco Lavos 15e3654843 Added a way to turn off the light on the Leggings of the Burning Mantle. 2014-01-09 17:19:37 +00:00
Vasco Lavos fdd07e76d2 Research + Recipe for the Shadowbeam focus. 2014-01-09 17:13:59 +00:00
Vasco Lavos 556e4b9277 Boring balance. 2014-01-09 16:28:45 +00:00