upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-10-26 14:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,083 Commits 5 Branches 114 Tags
2.5.557-GTNH
Commit Graph
2083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TimeConqueror dd943e80a9 Fixed TT changes page text while loading ModTweaker scripts. 2.5.557-GTNH 2020-02-10 18:00:12 +03:00
TimeConqueror 4c9d2a00ab Fixed TTResearchItem.setPages calling twice 2020-02-10 16:17:07 +03:00
TimeConqueror 8e64099df4 Cleaned gradle up and made it buildable 2020-02-10 13:04:05 +03:00
Dream-Master 60383f52df Ores that exists in GT not working 2.5.556-GTNH 2020-02-02 00:37:52 +01:00
Dream-Master 17a06b2c2d Quest Suggestion: Bedrock Dimension #5476 
https://github.com/GTNewHorizons/NewHorizons/issues/5476
add more ores
2.5.555-GTNH 		2020-02-02 00:00:07 +01:00
Martin Robertz 9f79fc786d Merge pull request #8 from bartimaeusnek/1.7-final 
Osmotic enchanter crash fix & AE2 API
 2018-04-05 15:19:52 +02:00
LOKKO12 bbe915413b added Gradlew autodownload for needed libs 2018-04-05 14:24:53 +02:00
LOKKO12 ce9de390fd try to fix Osmotic Enchanter Crash 
+ upgrade gradle
+ upgrade to java 8
+ removed apis
+ set Thaumcraft.proxy.essentiaTrailFx client side only
 2018-03-30 06:13:20 +02:00
Martin Robertz 7a6f26f915 Merge pull request #7 from Thaumic-Tinkerer/1.7-final 
1.7 final
 2018-02-18 09:44:51 +01:00
Dream-Master ad8e9375a9 Merge branch '1.7.10-krypt' into 1.7-final 
Conflicts:
	build.gradle
	build.properties
	src/main/java/thaumic/tinkerer/common/core/handler/ConfigHandler.java
	src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusDislocation.java
	src/main/resources/assets/ttinkerer/lang/en_US.lang
 2018-02-18 09:34:53 +01:00
David Vierra eb36cf02dd Fix Remedium Talisman breaking other items (#6) 
* Fix Remedium Talisman breaking other items

When the Remedium Talisman breaks, it always breaks the item in the first ring slot instead. `BaubleType.AMULET.ordinal()`, whose value is 1, is incorrect. The `BaubleType` Enum is not bauble slot numbers.

The correct slot number for the amulet slot is 0. I don't see any constants to use for the amulet slots.

* Added comment
Added this comment in short to source.
 2018-02-18 02:04:03 +01:00
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
KryptonCaptain 3d6ed92e7f Armour buffs 
Ichor armour buffed to 5% discount (Not sure if I did this already). Awakened to 6% discount. 
Ichor armour given Warping 3
Added IRunicArmor to Ichor gear and Thaumium helm of revealing. Why this took 2 years and a forked build to implement is beyond me
2.5.552 		2017-07-10 21:40:53 +10:00
KryptonCaptain 96ecc27389 Move AE2 API 
From /src/main/java/ to /src/api/java/
 2017-07-09 21:42:39 +10:00
KryptonCaptain accc812448 Bump version 2017-07-08 22:48:41 +10:00
KryptonCaptain 4078ef5731 Foci sorting helper 
Will now display other variants if you have more than one copy of a foci in your inventory/pouch.
 2017-05-27 11:29:28 +08:00
KryptonCaptain bd07066f16 Upgradeable foci 
Yep. Finally. They're not all fully complete, but the basics are there
 2017-05-27 10:05:50 +08:00
KryptonCaptain cb230093d5 Unfucked soul heart rendering, mostly 
It was using GL11 functions to shift the ENTIRE FUCKING UI for some inexplicable reason. Especially noticeable on a mount, because it was shifting NEI too. Added a config if you need to adjust the height value, as it currently sits in the same spot as the Botania flight bar (and uses some of the code too)
Tweaked lang file. Now with 100% less weeb trash
Removed old load order functions
Cleaned up ConfigHandler
2.5.550 		2017-05-26 20:08:57 +08:00
KryptonCaptain 43ecd3f82f Delete deprecated config options 2017-05-26 16:40:14 +08:00
KryptonCaptain c74625c8f0 Fixed tooltips being boring 
TT armour vis discounts are now in standard purple
KAMI tools now display mode tooltip in dark aqua
 2017-05-25 21:08:59 +08:00
Dream-Master 48a1cdbe07 bump version 2.5.543-GTNH 2017-05-21 11:30:33 +02:00
Daniel 2eaec0d010 Should fix issues with gears. 2017-05-15 07:34:57 +02:00
KryptonCaptain 95e0a8350c Build script tweaks 
I like my one better
 2017-04-19 18:17:53 +10:00
Technus 504ad29aa8 Revert "Merge branch '1.7-final' of https://github.com/GTNewHorizons/ThaumicTinkerer into 1.7-final" 
This reverts commit fdc971841f.
 2017-04-13 21:28:28 +10:00
Dream-Master a2b24f95cd This will remove all the GT 00 ores and add some other to the Bedrock dimension 2.5.442-GTNH 2017-04-09 22:43:42 +02:00
Martin Robertz 906b93e16e Merge pull request #3 from Ugachaga/patch-2 
Added Blacklist config for Focus of Dislocation
 2017-04-08 21:21:47 +10:00
Dream-Master 973299fab8 bump version 2017-04-08 21:21:32 +10:00
Martin Robertz 20f233bbc4 Merge pull request #2 from Ugachaga/patch-1 
Forbidden dimensions config
 2017-04-08 21:21:11 +10:00
Technus abeafc36da add fire spreading config 2017-04-08 21:20:46 +10:00
Technus fdc971841f Merge branch '1.7-final' of https://github.com/GTNewHorizons/ThaumicTinkerer into 1.7-final 2017-04-08 21:20:29 +10:00
KryptonCaptain 137749c38a fix1 
# Conflicts:
# 	gradle/wrapper/gradle-wrapper.properties
 2017-04-08 21:20:17 +10:00
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
Kamesuta 7455daecd9 Infinite loop problem from Bedrock Dimension in sky block. 
Fix an infinite loop problem when returning from Bedrock Dimension in
sky block.
 2017-04-05 04:53:35 +09:00
Martin Robertz 9bba1f209a Merge pull request #3 from Ugachaga/patch-2 
Added Blacklist config for Focus of Dislocation
2.5.541 		2017-03-18 11:38:24 +01:00
Ugachaga 8cfa60719d Added Blacklist config for Focus of Dislocation 2017-03-18 15:43:43 +07:00
Martin Robertz 67ee85b77d Update README.md 2017-03-01 23:31:50 +01:00
Dream-Master 0c4cdad475 bump version 2.5.540 2017-02-25 18:27:22 +01:00
Martin Robertz dfec103fcf Merge pull request #2 from Ugachaga/patch-1 
Forbidden dimensions config
 2017-02-25 17:41:30 +01:00
Ugachaga 0da10ce8d4 more space 2017-02-25 22:07:44 +07:00
Ugachaga f35d8a755f space 2017-02-25 22:02:43 +07:00
Ugachaga eee99a0c81 Added forbidden dimension config 2017-02-25 22:00:57 +07:00
Technus db3bb554b4 add fire spreading config 2017-01-09 09:40:58 +01:00
Technus 2e1794b484 Merge branch '1.7-final' of https://github.com/GTNewHorizons/ThaumicTinkerer into 1.7-final 2017-01-09 08:33:52 +01:00
Technus 579c850ca1 fix1 2017-01-09 08:33:35 +01:00
Dream-Master 47896bc02d build gradle fix 2017-01-08 21:11:51 +01:00
Technus 97dc338023 Merge branch '1.7-final' of https://github.com/GTNewHorizons/ThaumicTinkerer into 1.7-final 2017-01-08 19:16:20 +01:00
Martin Robertz 79f59db6f5 Merge pull request #1 from Thaumic-Tinkerer/1.7-final 
1.7 final
 2017-01-08 19:13:32 +01:00
Technus da0bcacdf4 Merge branch 'up-1.7-final' into 1.7-final 2017-01-08 19:02:19 +01:00