upstream/ForbiddenMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForbiddenMagic.git synced 2026-11-12 08:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
303 Commits 3 Branches 38 Tags
6e00abc5cdfc1eb213974f327ea53dcb7c803e19
Commit Graph
303 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Raven Szewczyk 6e00abc5cd [ci skip] upgraded build system 2024-01-08 21:25:42 +00:00
rjnasers 435d6e4dc3 Fixing dependencies 0.6.7-GTNH 2023-05-05 20:21:06 -07:00
Martin Robertz c670abe13c Merge pull request #11 from Zereff06/scribing_tools_v2 
fix-> scribing tools can't form the table (more 2 ScribeTools)
0.6.6-GTNH 		2023-02-12 11:43:10 +01:00
Zereff06 3742b0be9a fix-> scribing tools can't form the table (more 2 ScribeTools) 2023-02-12 11:49:30 +02:00
Martin Robertz 045967eeb7 Merge pull request #10 from Zereff06/master 
fix-> scribing tools can't form the table
0.6.5-GTNH 		2023-02-11 21:48:52 +01:00
Zereff06 4e33de8470 spotlessApply 2023-02-11 22:29:11 +02:00
Zereff06 e4ff5665f8 fix-> scribing tools can't form the table 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9722
 2023-02-11 22:21:08 +02:00
Raven Szewczyk 6c20c8447e [ci skip] upgraded build system 2023-01-31 09:52:47 +00:00
Jason Mitchell 1558fdb5e4 [ci skip] Add git-blame-ignore-revs for spotlessApply 2023-01-29 12:41:35 -08:00
Jason Mitchell 1e0800ce3f [ci skip] spotlessApply with the new settings 2023-01-29 12:41:35 -08:00
Jason Mitchell a4862ed8c9 [ci skip] Update buildscript to RetroFuturaGradle 2023-01-29 12:40:59 -08:00
Martin Robertz 7089632e03 Merge pull request #9 from GTNewHorizons/spotless 
Update buildscript & apply spotless
0.6.4-GTNH 		2022-09-24 12:23:22 +02:00
Raven Szewczyk 45139f4730 Apply spotless 2022-09-24 08:55:21 +01:00
Raven Szewczyk bc98fa8da6 Update buildscript 2022-09-24 08:55:16 +01:00
Jason Mitchell 970a0d18c8 [ci skip] Migrate github actions to GTNH-Actions-Workflows 2022-07-16 10:48:11 -07:00
Martin Robertz 3dc4e0aa29 Merge pull request #8 from GTNewHorizons/applecore 
Add AppleCore compatibility
0.6.3-GTNH 		2022-06-04 22:59:44 +02:00
miozune 0731f86b03 Add AppleCore compatibility 2022-06-04 16:57:54 +09:00
Martin Robertz 13f9b8e0b6 Merge pull request #7 from GTNewHorizons/MuXiu1997-patch-1 
BM Rituals Localization
 2022-04-29 15:35:18 +02:00
MuXiu1997andKiwi cd2de4352f Update zh_CN.lang 
Context: https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10229

Co-authored-by: Kiwi <42833050+Kiwi233@users.noreply.github.com>
 2022-04-29 18:18:21 +08:00
MuXiu1997 2adb573f1e Update en_US.lang 2022-04-29 17:05:04 +08:00
Martin Robertz cb620dbfd5 Merge pull request #6 from GTNewHorizons/maven 
buildscript for maven
0.6.2-GTNH 		2022-02-12 22:15:10 +01:00
bombcar 4ee5f764cd buildscript for maven 2022-02-12 10:12:18 -06:00
Martin Robertz c8987708f5 Merge pull request #5 from GTNewHorizons/fixbuild 
Fixbuild
0.6.1-GTNH 		2021-12-23 19:34:14 +01:00
bombcar f0243fb309 add version info 2021-12-23 11:55:42 -06:00
bombcar b8b8249444 fixbuild 2021-12-23 11:52:57 -06:00
Johann Bernhardt dd5a47264e Merge pull request #4 from GTNewHorizons/unified-build-script 
Unified build script
0.6-GTNH 		2021-12-19 23:59:30 +01:00
Johann Bernhardt fd2aeb4b5f Resolved todo in dependencies 2021-12-19 22:09:50 +01:00
Johann Bernhardt 0a7250bc8f Migrate to unified build script 2021-12-18 12:41:04 +01:00
Johann Bernhardt 5e7f5a4a13 Remove copied APIs 2021-12-18 12:40:32 +01:00
DreamMasterXXL c541b988b6 add(Forbidden-Magic)Changelog 2021-06-27 23:24:40 +02:00
DreamMasterXXL a1c0e894d4 bump version 0.575-gtnh-2 2021-06-15 21:41:13 +02:00
Martin Robertz 05afc78fba Merge pull request #3 from Reystlin/patch-1 
Update ru_RU.lang
 2021-06-03 20:06:50 +02:00
Reystlin 0c861947cb Update ru_RU.lang 2021-06-04 00:36:56 +07:00
Reystlin 45e3667a8c Update ru_RU.lang 
thanks for the suggestions repo-alt
 2021-06-04 00:20:36 +07:00
Reystlin 7b70b10082 Update ru_RU.lang 
Сorrecting grammatical errors, adding new translated text
 2021-05-26 00:01:55 +07:00
DreamMasterXXL 5703b17863 Merge branch 'master' of https://github.com/GTNewHorizons/ForbiddenMagic 
# Conflicts:
#	.gitignore
 2021-04-27 19:48:19 +02:00
DreamMasterXXL 46fd73c43f add libs 2021-04-27 19:46:58 +02:00
DreamMasterXXL 6bbc13ec81 update git ignore 2021-04-27 19:46:30 +02:00
Martin Robertz 72bb9bfdd2 Merge pull request #2 from repo-alt/feature/gradle_fix 
fixed gradle after forge change
 2021-04-27 19:42:05 +02:00
repo_alt 2fbb295c67 fixed gradle after forge change 2021-04-27 20:18:06 +03:00
DreamMasterXXL fe60db4037 add gradle 2021-04-27 18:53:49 +02:00
Martin Robertz 40d7828b61 Merge pull request #1 from jss2a98aj/master 
Fixes
 2021-04-27 18:51:29 +02:00
jss2a98aj 0e24ab65ba Update gitignore and build.gradle 2020-05-11 07:37:00 -04:00
jss2a98aj 7090fe5d36 Fix Crystal Scribing Tool crafting difficulty being inverted. 2020-02-19 03:23:49 -05:00
jss2a98aj 69b47487fd Bump version to 0.576 2020-02-19 02:45:15 -05:00
jss2a98aj 46f0230866 0.575 bugfixes 2020-02-19 02:44:33 -05:00
jss2a98aj 51ff3c0ec1 Grab Korean translation from the 0.575 jar (0.575 was never pushed?) 2020-02-19 01:49:55 -05:00
jss2a98aj 8196c7bae7 Update forge to 10.13.4.1614 2020-02-19 01:42:43 -05:00
jss2a98aj 9dd71a2911 Fix "Rendering item java.lang.ArrayIndexOutOfBoundsException: 32768" 2020-02-19 01:29:11 -05:00
Jeremy Diamond 821a18910f Fixing Stuff 
Fixes #101
Fixes #100
 2016-03-30 18:18:56 -07:00