mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
5,708 Commits 1 Branch 0 Tags 64 MiB
e5deee2bbd
Commit Graph

5708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nameless
f9d4be9cbb Translate messages_zh-CN.yml via GitLocalize 2020-10-18 02:44:33 +00:00
TheBusyBiscuit
c4bf0ecdd2 First step towards a task 2020-10-18 01:44:32 +02:00
TheBusyBiscuit
13cbe829dc
[CI skip] Merge pull request #2482 from Slimefun/renovate/com.konghq-unirest-java-3.x 
Update dependency com.konghq:unirest-java to v3.11.02
 2020-10-17 15:20:14 +02:00
Renovate Bot
087af60ab8
Update dependency com.konghq:unirest-java to v3.11.02 2020-10-17 13:17:35 +00:00
Panda.com
e5d341485f Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/#2470 
# Conflicts:
#	src/main/resources/tags/block_placer_ignored_materials.json
 2020-10-17 13:37:41 +02:00
TheBusyBiscuit
07eba9319a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
bee-armor

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
 2020-10-17 13:28:30 +02:00
TheBusyBiscuit
9f3e2bba7c [CI skip] Removed a troublesome config setting 2020-10-17 13:22:22 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
TheBusyBiscuit
b976370d97 Reverted deprecation warning 2020-10-17 12:07:21 +02:00
TheBusyBiscuit
bc7acfee22
[CI skip] Merge pull request #2480 from Slimefun/gitlocalize-13844 
Updated hebrew translations
 2020-10-17 12:03:51 +02:00
Timotiyadeyhakesem
ca6962811f Translate categories_he.yml via GitLocalize 2020-10-16 21:57:07 +00:00
CURVX
adcb52becf
Merge pull request #3 from Slimefun/master 
[CI skip] Update fork
 2020-10-16 01:09:20 +05:30
uiytt
0a18c30890 Removed now useless method : research 2020-10-15 17:38:59 +02:00
uiytt
f987e6b85d Added unit test for event 
I'm not so sure about this.
I've never writed any tests before
 2020-10-15 17:34:56 +02:00
Panda.com
49c7d3ad23 14* prs 2020-10-15 15:49:00 +02:00
Panda.com
c00ded786a fix? 2020-10-15 15:46:01 +02:00
Panda.com
372c6b41b1 a 2020-10-15 15:45:23 +02:00
Panda.com
349c57aef4 a 2020-10-15 15:44:32 +02:00
Panda.com
7dbbb87af5 ? 2020-10-15 15:43:28 +02:00
Panda.com
6611eaf444 idk whats wrong with "values" 2020-10-15 15:43:06 +02:00
Panda.com
29541cdfe2 Someone else can go format this if its not good 2020-10-15 15:41:21 +02:00
Panda.com
16bf13b2af stop bullying 2020-10-15 15:12:03 +02:00
Panda.com
3b43dd7ebc good now? 2020-10-15 15:08:42 +02:00
Panda.com
ee3e358f31 :pansad: 2020-10-15 15:07:50 +02:00
Panda.com
27583fc3f0 1 eternity later 2020-10-15 15:05:06 +02:00
Panda.com
0b27ea6ed5 ? 2020-10-15 15:03:02 +02:00
Panda.com
b70949a386 fixed fingerscrossed 2020-10-15 14:59:44 +02:00
Panda.com
78dcaa4328 fixes #2470 2020-10-15 14:42:44 +02:00
TheBusyBiscuit
ceab97361f
[CI skip] Merge pull request #2476 from Slimefun/gitlocalize-13833 
added new translations
 2020-10-15 14:22:47 +02:00
TheBusyBiscuit
954b0075e6 [CI skip] Added package-info.json 2020-10-15 14:15:37 +02:00
Dams_
9d144cd835 Translate messages_fr.yml via GitLocalize 2020-10-15 11:51:13 +00:00
Pierre
36ccb4e5eb Translate messages_fr.yml via GitLocalize 2020-10-15 11:51:12 +00:00
TheBusyBiscuit
e18c7cb245 Fixed a dupe bug with mcMMO 2020-10-15 13:50:12 +02:00
TheBusyBiscuit
9e0a5451e9
[CI skip] Merge pull request #2475 from Slimefun/gitlocalize-13830 
Update Japanese Translation file
 2020-10-15 00:48:25 +02:00
bito-blosh
abad3ae7fc Translate messages_ja.yml via GitLocalize 2020-10-14 22:42:52 +00:00
TheBusyBiscuit
a5ee1cda5a Translate messages_ja.yml via GitLocalize 2020-10-14 22:42:51 +00:00
TheBusyBiscuit
01770d11ff
[CI skip] Merge pull request #2474 from Slimefun/gitlocalize-13829 
Tagalog Translation Update
 2020-10-14 22:51:07 +02:00
Scott Gomez Andoy
c2ade61beb Translate researches_tl.yml via GitLocalize 2020-10-14 17:18:24 +00:00
Scott Gomez Andoy
20b8dbf09d Translate messages_tl.yml via GitLocalize 2020-10-14 17:18:23 +00:00
uiytt
19133a05f9 Added guideClickInteraction method 
Added a method in research which manage what to do when a player click on a un-researched item in a guide
 2020-10-14 18:28:54 +02:00
CURVX
35fc23c428 Redundant import 2020-10-14 21:40:49 +05:30
CURVX
1437a8d555 Added FakeInv in ArmorForge 2020-10-14 21:34:57 +05:30
uiytt
08b32ce89f Typo fix 2020-10-14 17:39:16 +02:00
TheBusyBiscuit
88cf1f2df2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 14:57:10 +02:00
TheBusyBiscuit
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +02:00
TheBusyBiscuit
f75da6af33
[Ci skip] Seting a release date for RC-17 2020-10-14 14:40:10 +02:00
TheBusyBiscuit
42f849d891 Fixes #2423 2020-10-14 13:31:02 +02:00
TheBusyBiscuit
8440143f41 Refactoring 2020-10-14 13:20:12 +02:00
TheBusyBiscuit
1ffe2fd493 Fixes #2411 2020-10-14 00:51:21 +02:00
TheBusyBiscuit
50e926d18a Fixes #2457 2020-10-14 00:34:04 +02:00