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,121 Commits 5 Branches 114 Tags
edcac6b16d911adc319c52e3f522398f83defa1b
Commit Graph
2121 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zereff06 edcac6b16d more readable version 2023-01-03 00:38:34 +02:00
Zereff06 e11de173f8 fix deflect effect 
with botania mod was checking only the entity of botania
 2023-01-02 17:30:09 +02:00
Martin Robertz dc69ee1728 Merge pull request #19 from greesyB/master 
Increase discount of ichor armors
2.6.5 		2022-07-29 18:39:02 +07:00
greesyB 13166986e3 Increase discount of ichor armors 2022-07-28 14:14:45 -05:00
Jason Mitchell 903f158d38 [ci skip] Migrate github actions to GTNH-Actions-Workflows 2022-07-16 10:51:40 -07:00
Martin Robertz 9a0ffdee8c Merge pull request #18 from GTNewHorizons/updatebuild 
BY-NC-SA 3.0
2.6.4 		2022-02-14 21:58:46 +01:00
bombcar 52d1767fea update links 2022-02-14 10:42:14 -06:00
bombcar 7ddb0889c8 update readme 2022-02-14 10:37:43 -06:00
bombcar caf6c961f6 CC BY-NC-SA 3.0 2022-02-14 10:33:24 -06:00
bombcar acd53891c1 update buildscript 2022-02-14 10:11:30 -06:00
bombcar 18d51d40f9 remove double access transformer (#17) 2.6.3 2022-02-10 18:43:26 -06:00
Martin Robertz e3f18c365b Merge pull request #16 from GTNewHorizons/updatebuild 
Updatebuild
2.6.2 		2022-01-24 16:29:07 +01:00
bombcar a32b0c1dc3 typos 2022-01-24 09:05:30 -06:00
bombcar 28c0a749c8 newbuildscript 2.6.1 2022-01-24 08:57:12 -06:00
Jason Mitchell 672822b1b1 update to explicit dependencies 2.6.0 2022-01-18 21:26:13 -08:00
Jason Mitchell 1505437bc4 maven publish buildscript update 2022-01-18 21:26:09 -08:00
Martin Robertz 377c5f688e Merge pull request #15 from GTNewHorizons/unified-build-script 
Unified build script
 2021-12-20 12:00:23 +01:00
Johann Bernhardt d7d50f873a Resolve todos in dependencies 2021-12-20 10:59:16 +01:00
Johann Bernhardt 37f5fa4e02 Migrate to unified build script 2021-12-20 09:54:20 +01:00
Johann Bernhardt 2609b03e02 Cleanup 2021-12-20 09:54:08 +01:00
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