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,119 Commits 5 Branches 114 Tags
dc69ee17282b8311cdefe18b07374485286f7592
Commit Graph
37 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Robertz dc69ee1728 Merge pull request #19 from greesyB/master 
Increase discount of ichor armors
 2022-07-29 18:39:02 +07:00
Martin Robertz 9a0ffdee8c Merge pull request #18 from GTNewHorizons/updatebuild 
BY-NC-SA 3.0
 2022-02-14 21:58:46 +01:00
Martin Robertz e3f18c365b Merge pull request #16 from GTNewHorizons/updatebuild 
Updatebuild
 2022-01-24 16:29:07 +01:00
Martin Robertz 377c5f688e Merge pull request #15 from GTNewHorizons/unified-build-script 
Unified build script
 2021-12-20 12:00:23 +01:00
Martin Robertz d14d2cf0a2 Merge pull request #14 from PolkageistHS/kamifix 
Fixes /iskamiunlocked
 2021-12-18 22:58:33 +01:00
Dream-Master 01b41b8f77 bump version 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
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
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
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
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
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
Dream-Master 60383f52df Ores that exists in GT not working 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
 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
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
Dream-Master 48a1cdbe07 bump version 2017-05-21 11:30:33 +02:00
Dream-Master a2b24f95cd This will remove all the GT 00 ores and add some other to the Bedrock dimension 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
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
Martin Robertz 9bba1f209a Merge pull request #3 from Ugachaga/patch-2 
Added Blacklist config for Focus of Dislocation
 2017-03-18 11:38:24 +01:00
Martin Robertz 67ee85b77d Update README.md 2017-03-01 23:31:50 +01:00
Dream-Master 0c4cdad475 bump version 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
Dream-Master 47896bc02d build gradle fix 2017-01-08 21:11:51 +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
Dream-Master d40e8585b3 Revert "change recipe i cant put all in modtweaker code." 
This reverts commit d179e36347.
 2016-03-27 15:56:06 +02:00
Dream-Master aa41a8485f Revert "First test to add hardcore recipes" 
This reverts commit 3c9322af05.
 2016-03-27 15:53:48 +02:00
Dream-Master d179e36347 change recipe i cant put all in modtweaker code. 
(Mob aspects)
 2016-03-27 15:53:40 +02:00
Dream-Master 3c9322af05 First test to add hardcore recipes 2016-03-24 00:55:09 +01:00
Dream-Master 9655c9b58d spelling fix 2016-03-23 21:51:33 +01:00
Dream-Master a9a7eabb72 fix the slab recipe 2016-03-23 19:24:45 +01:00