TheBusyBiscuit
|
30c87b2256
|
Merge pull request #2046 from LinoxGH/EnchRune
Enchantment Rune
|
2020-06-30 01:23:20 +02:00 |
|
LinoxGH
|
b6112e2728
|
Did a requested change.
|
2020-06-29 14:45:27 +03:00 |
|
LinoxGH
|
942bf436bb
|
Did another requested change.
|
2020-06-29 10:02:54 +03:00 |
|
LinoxGH
|
833b2d3943
|
Did another requested change.
|
2020-06-29 01:11:01 +03:00 |
|
LinoxGH
|
28b5d545da
|
Did some requested change.
|
2020-06-29 00:56:38 +03:00 |
|
LinoxGH
|
5c7accbbe8
|
Did the requested changes + a fix.
|
2020-06-28 23:46:09 +03:00 |
|
LinoxGH
|
27ba744fe5
|
Fixed a little bug.
|
2020-06-28 22:09:04 +03:00 |
|
LinoxGH
|
e55e2690e7
|
Did the requested changes.
|
2020-06-28 22:06:35 +03:00 |
|
TheBusyBiscuit
|
c63f4bf8af
|
Merge pull request #2057 from LinoxGH/HazmatSuitBees
Added Bee Protection to Hazmat Suit.
|
2020-06-28 17:12:10 +02:00 |
|
TheBusyBiscuit
|
03c08ed6f1
|
Fixes #2062
|
2020-06-28 11:20:56 +02:00 |
|
LinoxGH
|
3e271ac786
|
Did more requested changes.
|
2020-06-28 05:29:51 +03:00 |
|
LinoxGH
|
a935951c22
|
Oops forgot to change these.
|
2020-06-28 01:14:37 +03:00 |
|
LinoxGH
|
07d837299f
|
Did the requested changes.
|
2020-06-28 01:07:37 +03:00 |
|
LinoxGH
|
64a1b247b4
|
Did the requested changes + fixes.
|
2020-06-27 17:30:28 +03:00 |
|
LinoxGH
|
a456034005
|
Fixed merge conflicts.
|
2020-06-27 16:07:22 +03:00 |
|
LinoxGH
|
ba0c3b30dd
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees
Conflicts:
src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
|
2020-06-27 16:01:36 +03:00 |
|
LinoxGH
|
b5ef8ff019
|
Did the requested changes + improvements.
|
2020-06-27 15:58:36 +03:00 |
|
TheBusyBiscuit
|
4314581a61
|
Another fix and an addition
|
2020-06-27 14:22:45 +02:00 |
|
TheBusyBiscuit
|
50aaa4b965
|
Added a few more items to the Bio Generator
|
2020-06-27 14:04:31 +02:00 |
|
TheBusyBiscuit
|
3dc043c857
|
Refactoring: Relocated Plugin class
|
2020-06-27 13:10:47 +02:00 |
|
LinoxGH
|
73973a00b7
|
Did the requested changes and some fixes.
|
2020-06-27 12:26:15 +03:00 |
|
LinoxGH
|
52dc7585fc
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java
|
2020-06-27 08:09:09 +03:00 |
|
TheBusyBiscuit
|
6d36655081
|
Another optimization for Solar Generators
|
2020-06-27 03:40:27 +02:00 |
|
TheBusyBiscuit
|
bd2f4b196d
|
Minor optimization for Solar Helmet checks
|
2020-06-27 03:29:10 +02:00 |
|
TheBusyBiscuit
|
468617d9a2
|
Changed a comment.
|
2020-06-27 03:13:43 +02:00 |
|
TheBusyBiscuit
|
44c0029587
|
Fixed a rare concurrency issue with world saving
|
2020-06-27 02:47:53 +02:00 |
|
TheBusyBiscuit
|
0dfd40e407
|
Fixed a few more color codes for 1.16 (Sorry Walshy :P )
|
2020-06-27 02:35:29 +02:00 |
|
TheBusyBiscuit
|
f6f09d2e2e
|
Some more refactoring
|
2020-06-27 02:28:01 +02:00 |
|
TheBusyBiscuit
|
b2833b3ce8
|
Removed unused parameter
|
2020-06-27 02:18:49 +02:00 |
|
TheBusyBiscuit
|
e081d15c6d
|
Fixed a slight mistake with the lore
|
2020-06-27 01:46:20 +02:00 |
|
LinoxGH
|
ffd57ec760
|
Did the requested Changes
|
2020-06-27 01:51:38 +03:00 |
|
LinoxGH
|
29fe881768
|
Added a new lore to Hazmat Suit for 1.15+
|
2020-06-26 23:31:15 +03:00 |
|
LinoxGH
|
cd4a36c519
|
Added Bee Protection to Hazmat Suit.
|
2020-06-26 23:18:27 +03:00 |
|
TheBusyBiscuit
|
80fc0a173e
|
Added lore addition
|
2020-06-26 20:58:23 +02:00 |
|
TheBusyBiscuit
|
ed85a9a051
|
Added Unit tests for rechargeable items
|
2020-06-26 17:58:54 +02:00 |
|
TheBusyBiscuit
|
28e5b57c5d
|
Some better exception handling
|
2020-06-26 17:36:57 +02:00 |
|
TheBusyBiscuit
|
8d0c816ed2
|
Some performance improvements
|
2020-06-26 16:27:16 +02:00 |
|
TheBusyBiscuit
|
6ffa5ab9a7
|
Lots of refactoring and rewriting of Item Energy
|
2020-06-26 15:32:57 +02:00 |
|
LinoxGH
|
eb2bbae0c9
|
Did the requested changes.
|
2020-06-26 13:31:45 +03:00 |
|
LinoxGH
|
9176d795c8
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune
|
2020-06-26 13:28:45 +03:00 |
|
TheBusyBiscuit
|
1520e71107
|
Updated translators
|
2020-06-25 22:51:56 +02: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 |
|
TheBusyBiscuit
|
d18af0c211
|
Ore Crusher now also accepts Nether Gold Ore
|
2020-06-25 15:27:18 +02:00 |
|
TheBusyBiscuit
|
427a312240
|
More steps towards 1.16 compatibility (unfinished)
|
2020-06-25 14:43:17 +02:00 |
|
TheBusyBiscuit
|
92e7e58915
|
Merge branch 'master' into support/1.16
|
2020-06-25 13:40:28 +02:00 |
|
TheBusyBiscuit
|
3b7ad0ac63
|
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix
Auto Drier 1.13 Update
|
2020-06-25 13:27:50 +02:00 |
|
LinoxGH
|
f9c8cd1d76
|
Fixed the recipe.
|
2020-06-25 14:08:57 +03:00 |
|
LinoxGH
|
82b9de4c54
|
Fixed merge conflict.
|
2020-06-25 13:38:30 +03:00 |
|
LinoxGH
|
7e20e7cd9f
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
|
2020-06-25 13:37:33 +03:00 |
|
Daniel Walsh
|
81e16a6c47
|
1.16 support
|
2020-06-25 06:05:17 +01:00 |
|