TheBusyBiscuit
|
572d3dceec
|
Merge branch 'experimental' into ShulkerShell
|
2020-07-13 17:05:39 +02:00 |
|
TheBusyBiscuit
|
6a950fe8d6
|
Fixed lore
|
2020-07-05 13:06:13 +02:00 |
|
LinoxGH
|
e55e2690e7
|
Did the requested changes.
|
2020-06-28 22:06:35 +03:00 |
|
LinoxGH
|
f54b277111
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/resources/languages/researches_en.yml
|
2020-06-25 22:35:14 +03:00 |
|
LinoxGH
|
7a09253311
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ShulkerShell
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/resources/languages/researches_en.yml
|
2020-06-25 10:11:33 +03:00 |
|
LinoxGH
|
8f0c5100d4
|
Merge branch 'master' into AutoBrewer
|
2020-06-24 22:38:15 +03:00 |
|
TheBusyBiscuit
|
c64b311ee2
|
Finished merge of PR #2015 and updated language keys
|
2020-06-24 21:25:21 +02:00 |
|
LinoxGH
|
4832701fda
|
Added a research for the recipe.
|
2020-06-24 21:41:35 +03:00 |
|
LinoxGH
|
4f6bbafdfc
|
Added Auto Brewer.
A new medium machine that can create potions automatically.
|
2020-06-24 21:24:16 +03:00 |
|
LinoxGH
|
07224cc7d5
|
Added Enchantment Rune.
Added Enchantment Rune that applies a random enchantment on items.
Works similar to Soulbound Rune.
|
2020-06-24 16:28:35 +03:00 |
|
LinoxGH
|
3278457441
|
Did the requested changes.
|
2020-06-24 01:06:48 +03:00 |
|
TheBusyBiscuit
|
c8f78379a1
|
Added Industrial Miner
|
2020-06-05 00:00:07 +02:00 |
|
TheBusyBiscuit
|
0c5ef6fc83
|
Added Makeshift Smeltery + Tree Growth Accelerator
|
2020-03-16 02:18:35 +01:00 |
|
TheBusyBiscuit
|
fef2a4ae2d
|
Added Makeshift Smeltery
|
2020-03-16 01:57:37 +01:00 |
|
TheBusyBiscuit
|
b94c5ca55d
|
[CI skip] Added researches to translatable files
|
2020-02-02 14:56:18 +01:00 |
|