upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 16:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,571 Commits 12 Branches 179 Tags
2ea30197ae3da86865bafe905680c4e651e32ee8
Commit Graph
1571 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lizbeth Rika 2ea30197ae Fixed divining rod recipe crash. 2014-08-26 17:25:00 +01:00
Lizbeth Rika 29501e2c04 Removed Thaumcraft Addon shit. 2014-08-26 16:19:47 +01:00
Lizbeth Rika a2479916c2 Merge pull request #272 from Mrkwtkr/patch-1 
Update zh_CN.lang
 2014-08-26 13:18:12 +01:00
Mrkwtkr da27cbdf09 Update zh_CN.lang 2014-08-26 19:06:58 +08:00
Lizbeth Rika 10d397c625 Just before I forget. 2014-08-26 03:44:06 +01:00
Lizbeth Rika da15b44e32 Build 105 2014-08-25 20:52:32 +01:00
Lizbeth Rika 4f006a9131 Added the Rod of Divining. 2014-08-25 20:35:01 +01:00
Lizbeth Rika a29ada6fe9 Right. 2014-08-25 02:35:04 +01:00
Lizbeth Rika 5c878d7404 Ermergerd wrap!!1 2014-08-25 02:09:09 +01:00
Lizbeth Rika 6c7c3477de Added goldfish. 2014-08-25 01:32:47 +01:00
Lizbeth Rika 805a76d1d5 Merge pull request #268 from mattcr11/spark/DomOP 
Dominant sparks stop draining newly upgraded sparks now.
 2014-08-25 00:19:41 +01:00
Matthew Rucker cb3feafbed Dominant sparks stop draining newly upgraded sparks now. 2014-08-24 18:55:37 -04:00
Lizbeth Rika a623bd4e59 Merge pull request #267 from mattcr11/spark/clientcrash 
Fixed NullPointerException
 2014-08-24 23:41:56 +01:00
Matthew Rucker 7101895a07 Fixed NullPointerException by extending error check to also handle client side. 2014-08-24 18:34:51 -04:00
Lizbeth Rika 09f267951c Build 104. 2014-08-24 18:38:38 +01:00
Lizbeth Rika 257aa3f91f The Gaia Guardian now can't be spawned if the world is in peaceful, it also despawns in this case. 2014-08-24 18:23:14 +01:00
Lizbeth Rika a394a2357e Added the Horn of the Canopy. 2014-08-24 18:20:57 +01:00
Lizbeth Rika e1ce29b002 Fixed server crash. 2014-08-24 17:25:59 +01:00
Lizbeth Rika 072b124a9b Build 103. 2014-08-24 16:22:14 +01:00
Lizbeth Rika 746f7d84fe Fixed platform crashes. 2014-08-24 15:43:44 +01:00
Lizbeth Rika ce5148f5a4 Fixed SoundLogic's mess. 2014-08-24 15:43:24 +01:00
Lizbeth Rika 5dedff6a85 Merge pull request #263 from soundlogic2236/ConfigShedding 
Config shedding
 2014-08-23 23:04:41 +01:00
SoundLogic 72a24a3899 Forgot to save this 2014-08-23 17:00:56 -05:00
SoundLogic 6c62232442 Couple more empty lines removed 2014-08-23 17:00:06 -05:00
SoundLogic 2044198d2d So much formatting cleaning. Still, no one suggested decapitation, so an improvement! 2014-08-23 16:54:45 -05:00
SoundLogic fee1b8cc96 Advanced Configurable Shedding Options 2014-08-23 16:01:06 -05:00
SoundLogic c24571006a Created the needed pages in the botania guide 2014-08-23 14:35:39 -05:00
Lizbeth Rika 8e7b821708 Build 102. 2014-08-23 16:14:22 +01:00
Lizbeth Rika fd72377a59 Swapped Generating and Functional Flora in the lexicon. Because it just makes sense. 2014-08-23 16:12:15 +01:00
Lizbeth Rika d3a3a3fe17 More spark fixes. 2014-08-23 15:05:10 +01:00
Lizbeth Rika d0fffb9996 Fixed crash if a Mana Pool is broken while a Spark is interacting with it. Closes #262 2014-08-23 14:52:49 +01:00
Lizbeth Rika 7ba4d349b9 Fixed Terra Shatterer crashes in 1.7.2. 2014-08-23 14:49:40 +01:00
Lizbeth Rika 240b65bfb7 Build 101. 2014-08-22 23:28:39 +01:00
Lizbeth Rika 49be33c202 Website updates. 2014-08-22 23:23:05 +01:00
Lizbeth Rika 24b401ac63 Cleaaanup~ 2014-08-22 23:21:28 +01:00
Lizbeth Rika bc6c9e37f1 Merge branch 'master' of https://github.com/Vazkii/Botania 2014-08-22 21:52:59 +01:00
Lizbeth Rika 0d7ed02863 Pinkaxe of the Core. 2014-08-22 21:52:55 +01:00
Lizbeth Rika bccdc6d6df Merge pull request #259 from Adaptivity/patch-4 
Update en_US.lang
 2014-08-22 19:09:09 +01:00
Anton 3bc54e43f6 Update en_US.lang 
You can kill me if you want. Hopefully last edit for today.
 2014-08-22 22:07:49 +04:00
Lizbeth Rika 9542a4ac8b Optimized the Shard of Laputa. Closes #256. 2014-08-22 19:04:39 +01:00
Lizbeth Rika be5e25ede2 Merge pull request #258 from Adaptivity/patch-4 
Update en_US.lang
 2014-08-22 19:01:53 +01:00
Anton 37527271d4 Update en_US.lang 
Nothing I can do with myself. It's all my Notepad++. It's just finds them.
 2014-08-22 21:56:09 +04:00
Lizbeth Rika 4570359499 Merge pull request #257 from Adaptivity/patch-4 
Update en_US.lang
 2014-08-22 18:34:06 +01:00
Anton 5c8de17c7e Update en_US.lang 2014-08-22 21:26:57 +04:00
Lizbeth Rika 328798faec Fixed the Mana Enchanter ignoring enchantment types (Power on swords, Sharpness on armor, etc) 2014-08-22 18:18:21 +01:00
Lizbeth Rika 4d2e3cf70e Revert "Changed how bauble ticking works." 
This reverts commit 96277d3315.
 2014-08-22 18:02:43 +01:00
Lizbeth Rika ff63ed2d3a Merge pull request #255 from Adaptivity/patch-4 
Update en_US.lang
 2014-08-22 17:56:55 +01:00
Lizbeth Rika d9ba409f63 Recipe/docs for Sparks. *phew* Finally done with them. 2014-08-22 17:56:04 +01:00
Anton b0b7e24aa5 Update en_US.lang 
I found it!
 2014-08-22 20:07:05 +04:00
Lizbeth Rika eb6692c0e5 Spark render polish. 2014-08-22 16:21:12 +01:00