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
2251 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Johann Bernhardt 6c56d3c9b1 Delete copied APIs 2021-12-20 09:53:23 +01:00
Martin Robertz d14d2cf0a2 Merge pull request #14 from PolkageistHS/kamifix 
Fixes /iskamiunlocked
 2021-12-18 22:58:33 +01:00
John Baird b605a836ea Fixes /iskamiunlocked 2021-12-17 19:30:11 -08:00
Dream-Master 01b41b8f77 bump version 2.5-559-GTNH 2021-08-16 13:06:49 +02:00
Martin Robertz 6e914be9eb Merge pull request #13 from Kiwi233/1.7-final 
Update zh_CN.lang
 2021-08-02 15:14:51 +02:00
[Kiwi233] 6a71cd28ec Update zh_CN.lang 2021-08-02 20:24:56 +08:00
Jason Mitchell 3b2495870f Update build script and bump build number 2.5-558-GTNH 2021-05-01 17:27:58 -07:00
Martin Robertz f11fb8bad4 Merge pull request #12 from KiloJoel/necroTabletScanFix 
tablets of necromancy now scan the full square for pedestals
 2020-11-17 19:04:58 +01:00
KiloJoel 84b56e3f18 tablets of necromancy now scan the full square for pedestals 2020-11-17 14:05:27 +00:00
Martin Robertz 740c1d7fd9 Merge pull request #11 from glowredman/1.7-final 
Add localization for Infused Farmland
 2020-10-11 12:16:11 +02:00
glowredman 73223de2dd Add localization for Infused Farmland 2020-10-11 02:20:18 +02:00
Martin Robertz 65ba1f4464 Merge pull request #10 from GTNewHorizons/patch-dispersed-strike 
Fix GTNewHorizons/GT-New-Horizons-Modpack#6784
 2020-10-09 15:39:13 +02:00
Glease c8fdb5747f Fix Dispersed Strikes 
1. This fixes up the successiveStrikes counter. Previously it relies on a transient id to remember whether this is the same target. This id will not survive chunk unloads. It also cannot distinguish between second strike and third or fourth strike. 
  To prevent runaway effect the successiveStrikes counter is capped at 5.
2. It changes the algorithm used by Dispersed Strikes to a more reasonable one.
 2020-10-09 12:46:12 +08:00
Martin Robertz 52f872b6ad Merge pull request #9 from repo-alt/1.7-final 
Infused seeds harvest fix by @Barokko
 2020-09-02 16:24:03 +02:00
repo_alt f1751ce5bc Infused seeds harvest fix by @Barokko 2020-09-02 16:43:14 +03:00
repo_alt d4f5857ec0 updated Gradle to 4.4.1 
removed unnecessary task
 2020-09-02 16:24:28 +03:00
Dream-MasterXXL 80c1960c7c Revert "update gradle" 
This reverts commit 11c8199f4f.
 2020-02-11 11:47:18 +01:00
Dream-MasterXXL 11c8199f4f update gradle 2020-02-11 11:43:00 +01:00
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