upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,877 Commits 12 Branches 179 Tags
e84792607f1cfbbdfc1981ba95250287b3a018b9
Commit Graph
2877 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lizbeth Rika e84792607f Incense Plate automation stuffs. 2015-05-18 15:54:55 +01:00
Lizbeth Rika fe1035dfb6 Mana Bursts with the Flash lens can now create flashes in tall grass and other replaceable blocks. 2015-05-18 15:25:28 +01:00
Lizbeth Rika 02c3c614bf Added a bit more info to the Flower Pouch page. 2015-05-18 15:15:10 +01:00
Lizbeth Rika 1199e43843 Fixed the Flower Pouch showing a single chest interface when depositing the items in a double chest. Closes #978 2015-05-18 15:13:21 +01:00
Lizbeth Rika 9c9daae564 Lowered goldfish. 2015-05-18 15:08:31 +01:00
Lizbeth Rika e62c421374 Fixed SoundLogic's mess. 2015-05-18 14:48:29 +01:00
Lizbeth Rika 03c7a20480 Fixed Lazersmoke's mess. 2015-05-18 14:46:39 +01:00
Lizbeth Rika b5600c100f Merge pull request #984 from Lazersmoke/patch-2 
Added check for water when setting last recipe
 2015-05-18 14:40:19 +01:00
Lizbeth Rika 6de278236d Merge pull request #990 from soundlogic2236/master 
Added hooks for subtiles to control redstone behavior and light.
 2015-05-18 14:40:05 +01:00
SoundLogic 55977e5bd9 Added hooks for subtiles to control redstone behavior and light. 2015-05-18 07:52:19 -05:00
Sam Quinn de6eb80e00 Added check for water when setting last recipe 
closes #979
 2015-05-16 18:46:17 -05:00
wiiv 7a144f3fcd A bit less Terra(ria) Sword... 2015-05-16 18:51:29 +01:00
Lizbeth Rika 16b00db6b6 Merge pull request #981 from Greenicefrost/master 
Update zh_CN.lang
 2015-05-16 16:56:41 +01:00
Greenice 1320384262 Update zh_CN.lang 
Botania r1.6-189
 2015-05-16 22:48:23 +08:00
Dylan4ever fb90db11e0 Made the new craft patterns, now colorblind-friendly. I hope. I can't tell. 2015-05-16 15:06:01 +02:00
Lizbeth Rika 94064af793 Merge pull request #980 from puyo061/patch-12 
Update ko_KR.lang
 2015-05-16 13:27:57 +01:00
프요 55bbe6f64e Update ko_KR.lang 2015-05-16 17:47:30 +09:00
Lizbeth Rika ab12cf9c56 Build 189 2015-05-15 23:55:42 +01:00
Lizbeth Rika c961ca976a Gotta clean fast 2015-05-15 23:45:53 +01:00
Lizbeth Rika e5bdf25268 Recipe, docs and Stone of Temperance support for the Terra Truncator. 2015-05-15 23:27:47 +01:00
Lizbeth Rika f20ebefed5 Revert "Reworked the placeholder to more closely resemble the actual items it's made out of. The others will come too." 
This reverts commit 82dc14cd5e.
 2015-05-15 23:05:06 +01:00
Lizbeth Rika 6b60c7035f Revert "The rest of the gang." 
This reverts commit ec38e4a258.
 2015-05-15 23:04:56 +01:00
Lizbeth Rika 6afb8f0c43 The Horn of the Canopy now has a better way to check for leaves. It might even pick up Thaumcraft leaves now, who knows. It also reaches a bit higher. 2015-05-15 22:47:14 +01:00
Lizbeth Rika 819c367fab Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-15 22:41:02 +01:00
Lizbeth Rika a7db6e4139 Added the Terra Truncator (Terrasteel Axe). Also changed some mana cost values around. 2015-05-15 22:40:55 +01:00
Dylan4ever d38badc25b Update en_US.lang 
Every time I read the Lexica, I find a new something to fix. Things like these are pretty easy to overlook ofcourse.
 2015-05-15 21:10:41 +02:00
Dylan4ever ec38e4a258 The rest of the gang. 2015-05-15 21:08:29 +02:00
Lizbeth Rika f8edbe66e5 Merge pull request #974 from MrKunji/patch-15 
Update pt_BR.lang
 2015-05-15 20:00:22 +01:00
Dylan4ever 82dc14cd5e Reworked the placeholder to more closely resemble the actual items it's made out of. The others will come too. 2015-05-15 20:58:00 +02:00
Patric Alexandre 0e663cbb6e Update pt_BR.lang 
I can already smell the incenses from there.
 2015-05-15 15:47:17 -03:00
Lizbeth Rika 35600d2782 Move the incense stack render down just a tad so it doesn't z-fight. 2015-05-15 18:49:20 +01:00
Lizbeth Rika 6283aea2b9 Recipe/docs for Incense. 2015-05-15 18:48:48 +01:00
Lizbeth Rika 4582ef720d Get the Incense Plate working and doing stuff. 2015-05-15 18:11:57 +01:00
Lizbeth Rika fb044a5777 Baubles no longer call onEquipped when equipped through right click, the functionality is instead delegated to onEquippedOrLoadedIntoWorld. Fixes the Ring of Odin/Ring of the Aesir allowing for infinite health. Closes #971 2015-05-15 16:03:51 +01:00
Lizbeth Rika 2c41e88628 Added Incense Sticks. Now to make them do stuffs... 2015-05-15 15:54:11 +01:00
Dylan4ever cb160985b9 This is really intense... Incense... Sorry if I'm talking y'all in-senseless with all these bad puns. 2015-05-15 15:58:33 +02:00
Dylan4ever b670efa4dc This thing sucks... mana. Approve or I'll go back to the copy-pasting... I mean drawing table. 2015-05-15 15:47:20 +02:00
Dylan4ever e8260e130c The Axe Effect 2015-05-15 15:40:09 +02:00
Lizbeth Rika 41c3ad33ad The Red Stringed Relay can now connect to double tall flowers. 2015-05-15 14:23:26 +01:00
Lizbeth Rika 30bc2e8fd4 Added a bunch of null checks to the NEI integration to try to fix the weird crash that's been going around. Closes #961, for now, I guess. 2015-05-15 14:10:09 +01:00
Lizbeth Rika cf30dae374 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-15 14:01:49 +01:00
Lizbeth Rika 4ba87831db Fixed Excaliber only homing on players when it should home on anything but players. Also made it only home on mobs. Closes #958 2015-05-15 13:17:57 +01:00
Lizbeth Rika 63a95063e8 Merge pull request #972 from MrKunji/patch-14 
Update pt_BR.lang
 2015-05-15 13:15:51 +01:00
Lizbeth Rika f92eb3df3b Right clicking a Petal Apothecary or Runic Altar with an empty hand after a recipe is completed places the components of that recipe from your inventory into the block again for another crafting. 2015-05-15 13:14:47 +01:00
Patric Alexandre ce72caf833 Update pt_BR.lang 
'Next week: Lexica pages about Generating and Functional Flowers, stay tuned!'
 2015-05-15 09:07:10 -03:00
Lizbeth Rika 62107c26ec git gud diyo 2015-05-15 11:43:26 +01:00
Dylan4ever a02d2b4f18 Update en_US.lang 
Another little thingy I found.
 2015-05-15 11:28:11 +02:00
Lizbeth Rika 4301c4316c Merge pull request #967 from mDiyo/patch-1 
Armor respects unblockable damage types
 2015-05-14 21:22:42 +01:00
mDiyo d409e7cee4 Armor respects unblockable damage types 
This fixes #966
 2015-05-14 12:01:07 -08:00
Lizbeth Rika 87f3e8c0d0 Update contributing.md 2015-05-13 22:20:09 +01:00