1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

72 Commits

Author SHA1 Message Date
Panda.com
efa8d81f77 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
2020-03-01 14:33:44 +01:00
Panda.com
105b32583d Changed requested changes 2020-03-01 14:27:11 +01:00
TheBusyBiscuit
f007c1b68e [CI skip] Reduced technical debt 2020-03-01 10:36:31 +01:00
TheBusyBiscuit
dad60f85c4 Fixes #1577 2020-03-01 09:29:37 +01:00
TheBusyBiscuit
b2a0214ef0 [CI skip] More cleanup 2020-03-01 01:05:48 +01:00
TheBusyBiscuit
cec1107198 [CI skip] A bunch of refactoring 2020-02-29 23:42:02 +01:00
Daniel Walsh
cbd7faf4d7 General performance improvements 2020-02-27 16:11:32 +00:00
ThatPreston
0414cae04a
Remove Rainbow Concrete Powder 2020-02-26 15:21:45 -06:00
ThatPreston
2197b7eabd
Update ResearchSetup.java 2020-02-26 15:20:04 -06:00
ThatPreston
1e9dc2b85d
Added New Rainbow Blocks
Added rainbow concrete, concrete powder, and glazed terracotta to the rainbow blocks research group.
2020-02-25 18:38:45 -06:00
ThatPreston
d12f7b4b8e
Added New Rainbow Blocks
Added normal and seasonal variants of rainbow concrete, concrete powder, and glazed terracotta.
2020-02-25 18:36:53 -06:00
TheBusyBiscuit
2869a654c9 [CI skip] More Refactoring 2020-02-23 00:59:55 +01:00
TheBusyBiscuit
dcd7146949 [CI skip] Some minor changes 2020-02-22 18:54:23 +01:00
TheBusyBiscuit
51d33dee02 [CI skip] Recipe Types can now be translated as well 2020-02-22 15:41:35 +01:00
Nameless
0c3884ca91
Fix #1558 2020-02-22 18:55:09 +08:00
TheBusyBiscuit
6175cff35a A Refactoring Supernova - You don't wanna look at the Diff 2020-02-21 21:22:26 +01:00
TheBusyBiscuit
f9f3e495e7 [CI skip] Refactoring 2020-02-21 12:09:12 +01:00
TheBusyBiscuit
155a9572c4 Fixed #1557 2020-02-21 11:00:41 +01:00
Nameless
078b506aca
Try to fix #1513 2020-02-20 11:15:06 +08:00
TheBusyBiscuit
5e74657263 [CI skip] Changed the API a bit 2020-02-16 12:17:14 +01:00
TheBusyBiscuit
7d1e3b729e [CI skip] Updated change log 2020-02-14 10:49:45 +01:00
Nameless
b703f176a2
Fixed magician talisman can't give book extra enchantment 2020-02-14 11:16:41 +08:00
TheBusyBiscuit
ecfd242c32
Merge branch 'master' into patch-2 2020-02-13 01:46:02 +01:00
Nameless
d8c29ec7bb
Double ores by drop items 2020-02-13 08:40:18 +08:00
TheBusyBiscuit
0ff1311c32 [CI skip] Updated language files and reduced technical debt 2020-02-13 01:30:27 +01:00
Nameless
ef3c1f3d10
Update TalismanListener.java 2020-02-12 21:39:42 +08:00
Nameless
c25a39c955
Avoid can't get bonus items 2020-02-12 16:43:53 +08:00
Nameless
07b7ed73fa
Fixed give more items when using fortune pickaxe 2020-02-12 14:39:16 +08:00
Nameless
c899413f7f
Forgot to import packages 2020-02-12 14:14:08 +08:00
Nameless
b87354a39e
Fixed #1516 2020-02-12 14:07:42 +08:00
TheBusyBiscuit
2cf5989d7a More cleanup and Refactoring 2020-02-11 22:22:33 +01:00
TheBusyBiscuit
b916c3636b [CI skip] A lot of internal cleanup, performance improvements 2020-02-10 12:42:34 +01:00
TheBusyBiscuit
e53746990e [CI skip] Reduced technical debt 2020-02-09 23:13:15 +01:00
TheBusyBiscuit
3a5a18ae70 [CI skip] Moved some items to different categories 2020-02-09 13:42:21 +01:00
TheBusyBiscuit
04709365a4 Finishing touches, new stable release incoming 2020-02-09 12:04:06 +01:00
TheBusyBiscuit
be43f825a9 [Ci skip] Refactored Androids 2020-02-09 00:26:04 +01:00
TheBusyBiscuit
8b3aa8ffbe [Ci skip] Refactoring 2020-02-08 22:58:55 +01:00
poma123
9bb3fea54c Fix PickaxeOfContainmnet bug 2020-02-08 09:57:46 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
TheBusyBiscuit
f0a3ccc43c [CI skip] Reduced technical debt, improved performance, refactoring 2020-02-04 19:05:49 +01:00
TheBusyBiscuit
53345d0f8e Some refactoring + language updates 2020-02-02 18:27:32 +01:00
TheBusyBiscuit
ea26ac49b1 Ree... Reeeee... Reeeeeeeee... REFACTORING
(let's hope I didn't break anything)
2020-02-01 01:32:38 +01:00
TheBusyBiscuit
f0f3740a2c [CI skip] Minor refactoring 2020-01-31 09:47:04 +01:00
TheBusyBiscuit
761d52a9c6 Slimefun can now be translated (see wiki) 2020-01-30 22:03:17 +01:00
TheBusyBiscuit
6dc0907728 [CI skip] Reduced technical debt 2020-01-29 02:25:25 +01:00
TheBusyBiscuit
2133f528a9 Possibly fixes #1313 + Performance Improvements 2020-01-28 23:36:28 +01:00
TheBusyBiscuit
1f672905d2 Fixes #1394 2020-01-28 21:05:45 +01:00
TheBusyBiscuit
4882c7e4cc Super extreme ultra mega refactor 3000 2020-01-27 01:05:28 +01:00
TheBusyBiscuit
47b0ae5d9b Finalized Merging of Pull Request #1382 2020-01-25 17:16:16 +01:00