upstream/ForbiddenMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForbiddenMagic.git synced 2026-11-12 16:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
288 Commits 3 Branches 38 Tags
3dc4e0aa29352ddf62746d770da458bdc6c9bf22
Commit Graph
288 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeremy Diamond cf789e46ad Increment! 2016-01-13 22:10:15 -08:00
Jeremy Diamond 7aefe92f09 The Final Countdown! 
Fixes #97
Fixes #96
Fixes #94
 2016-01-13 22:09:42 -08:00
Jeremy Diamond 0eb028601d Dragonrekt 2016-01-08 05:14:04 -08:00
Jeremy Diamond 1211e88fe2 Botania Stuff 
Fixes #92
Fixes #90
 2015-12-05 22:48:28 -08:00
Jeremy Diamond 495a7f754f Chakras! 
Fixes #85
Fixes #73
 2015-11-14 00:52:57 -08:00
Jeremy Diamond b61ed5716a Cross-Mod Stuff 
Fixes #89
Fixes #79
 2015-11-13 00:57:02 -08:00
SpitefulFox f9254095eb Merge pull request #84 from EXTER7/master 
Updated Baubles API.
 2015-09-25 09:15:41 -07:00
EXTER 76103c8bea Updated Baubles API. 2015-09-25 11:36:39 -04:00
SpitefulFox 0f012b13bf Merge pull request #81 from laci200270/patch-1 
Fixes #80
 2015-08-15 15:20:20 -07:00
laci200270 3acf011804 Fixes #80 2015-08-03 23:53:08 +02:00
Jeremy Diamond 488c62fcb3 Researchy Things 
Tweaking Warp values
Fixing Tainted Block requirements
Fixing #75
 2015-06-27 15:08:31 -07:00
Jeremy Diamond af73524d50 Stuff and Things 
EE3 support
Fix #77
Heretic villager
Profane Wand
Enchants work with Primal Crusher
Enchants can be disabled
Increase Lust Shard drop
 2015-06-27 14:56:50 -07:00
SpitefulFox bb6ee62695 Merge pull request #74 from bakaxyf/master 
Update zh_CN.lang
 2015-05-31 14:14:43 -07:00
bakaxyf 3318f12a7a Update zh_CN.lang 2015-05-31 22:39:41 +08:00
SpitefulFox 5490905246 Merge pull request #70 from 3TUSK/patch-1 
Update zh_CN.lang
 2015-05-18 19:48:49 -07:00