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
209 Commits 3 Branches 38 Tags
f55ad7fbe0e268279857bc82c54bed020e30b68d
Commit Graph
209 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Diamond f55ad7fbe0 Toning down the rainbow 2015-02-16 22:12:27 -08:00
Jeremy Diamond f8b1fd9bfd Useless Asset 2015-02-16 22:12:20 -08:00
Jeremy Diamond 13d13636e8 Stuff 2015-02-16 22:12:05 -08:00
Jeremy Diamond be2c7ea668 API stuff 2015-02-16 22:11:29 -08:00
SpitefulFox 897caadcf0 Merge pull request #47 from Adaptivity/master 
Update localization
 2015-02-14 10:22:26 -08:00
Adaptivity 749ead39ef Fix 2015-02-14 15:43:57 +03:00
Adaptivity 9da01196ad Update localization 2015-02-14 14:40:10 +03:00
SpitefulFox 9805fc31aa Update plans.txt 2015-02-09 16:36:37 -08:00
Jeremy Diamond 83ff2cf913 More Wrath Cage support 2015-02-08 22:20:49 -08:00
Jeremy Diamond d40acd53e6 Privatization of the Botany 2015-02-08 22:20:42 -08:00
Jeremy Diamond c6a9849016 Stopping endless catches 2015-02-08 22:20:25 -08:00
Jeremy Diamond a56ba4cf04 Capitalist uses Greed Shards 2015-02-08 22:20:07 -08:00
Jeremy Diamond e8cd435c9f More whip encouragement 2015-02-08 22:19:51 -08:00
Jeremy Diamond 1f8fa07f97 Reorganizing and stuff 2015-02-08 17:00:34 -08:00
Jeremy Diamond 7c9f6d1bea Fixing the collar of pain localization 2015-02-08 10:47:56 -08:00
Jeremy Diamond e4e6e757a9 Incorporating Imprinting Crystal changes 2015-02-08 10:47:42 -08:00
Jeremy Diamond 0575d9b11d Fixing Imprinting Crystal 
Should satisfy issue #35
 2015-02-08 03:10:51 -08:00
Jeremy Diamond dc69c98393 Rearranging research and childproofing dependencies 2015-02-07 20:28:05 -08:00
Jeremy Diamond a6ec210b55 Fixing Impact enchant 2015-02-07 20:27:44 -08:00
Jeremy Diamond d13e360e91 Hardcoding TC dependency 
This is why we can't have nice things.
 2015-02-07 20:27:27 -08:00
Jeremy Diamond c10d6f1769 Fixing indents 2015-02-07 20:27:04 -08:00
Jeremy Diamond b2c73abcb7 Increment version! 2015-02-07 20:25:51 -08:00
SpitefulFox 0e697bef03 Update Texture Wishlist.txt 2015-01-29 16:21:29 -08:00
SpitefulFox 89e6daeaea Update Texture Wishlist.txt 2015-01-29 15:31:31 -08:00
SpitefulFox 091b1cf499 Merge pull request #40 from libertyCrown/master 
Create ja_JP.lang
 2015-01-27 03:54:09 -08:00
lib_Cr0wn e09ba73654 Create ja_JP.lang 2015-01-27 20:51:21 +09:00
SpitefulFox d069d8fc62 Merge pull request #39 from Adaptivity/localizestuff 
Additional localization
 2015-01-20 10:29:05 -08:00
Adaptivity f3d5564c6b missed one 2015-01-20 21:13:36 +03:00
Adaptivity d761764898 Additional localization 2015-01-20 21:07:53 +03:00
SpitefulFox ec78c60655 Merge pull request #36 from Adaptivity/pack.mcmeta 
Moved pack.mcmeta to the right place
 2015-01-13 10:04:45 -08:00
Adaptivity 3856136880 Moved pack.mcmeta to the right place 2015-01-13 20:57:35 +03:00
SpitefulFox 7056eb6bed Update Texture Wishlist.txt 2015-01-12 20:15:50 -08:00
SpitefulFox fb9442b8a1 Update Texture Wishlist.txt 2015-01-03 03:43:26 -08:00
Jeremy Diamond 73a12c7a84 Fixing the Eldritch Blood Orb 2015-01-01 13:55:53 -08:00
SpitefulFox 04560c8efa Merge pull request #32 from Adaptivity/patch-1 
Update ru_RU.lang
 2014-12-28 10:11:35 -08:00
Anton 47aaeed1d9 Update ru_RU.lang 2014-12-28 15:48:01 +03:00
Jeremy Diamond ffabe6945e Bugfixes and stuff 2014-12-21 09:46:45 -08:00
Jeremy Diamond 0f75db6587 Wishlist 2014-11-23 02:56:06 -08:00
Jeremy Diamond e528d6911b Bloodthorn added 2014-11-22 21:06:13 -08:00
Jeremy Diamond 82d6e0e8a5 Removing Warp Ward potion 2014-11-22 21:06:04 -08:00
Jeremy Diamond b6a5ab11fe Rebalancing Gula 2014-11-22 21:05:52 -08:00
Jeremy Diamond 33437f214c Removing unnecessary class 2014-11-22 21:05:42 -08:00
Jeremy Diamond 624390d398 Dreamwood, Elementium, and Tainthistle 2014-11-22 06:17:31 -08:00
Jeremy Diamond b4174a88bf Version Increment 2014-11-22 06:16:50 -08:00
Jeremy Diamond c6e2016f4d Added Tainthistle 2014-11-19 04:37:12 -08:00
Jeremy Diamond 8db3af1159 Department of Redundancy Department 2014-11-19 04:37:02 -08:00
Jeremy Diamond 725d4894f6 Plea of Delayed Insanity added 2014-11-17 04:40:47 -08:00
Jeremy Diamond b885af2e87 Collar of Pain added 2014-11-17 04:40:36 -08:00
Jeremy Diamond ce6e5597e0 Riding Crop now works on golems 2014-11-17 04:40:22 -08:00
Jeremy Diamond b1805a96b3 Increasing mana cost of Whisperweed 2014-11-17 04:40:05 -08:00