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

3922 Commits

Author SHA1 Message Date
Sfiguz7
386a9b6b95 Smallest documentation fix ever 2020-10-25 19:00:30 +01:00
poma123
99946174de Translate researches_hu.yml via GitLocalize 2020-10-25 14:40:55 +00:00
András Marczinkó
18f384e9cc Translate messages_hu.yml via GitLocalize 2020-10-25 14:40:53 +00:00
TheBusyBiscuit
487108df14 Fixes #2505 2020-10-25 14:40:05 +01:00
TheBusyBiscuit
31b912ac70 Oops, forgot to commit that line 2020-10-25 11:55:27 +01:00
TheBusyBiscuit
7f9bed54ff Added some documentation and two guide item ui ids 2020-10-25 11:54:45 +01:00
Seggan
a7cbea70c2 Added validation 2020-10-24 13:30:32 -04:00
Seggan
9dfc4bdcf4 Removed redundant check 2020-10-24 13:23:44 -04:00
Seggan
7a877cda66 Instruction is now public 2020-10-24 13:08:03 -04:00
Seggan
88096ff7c4 Changed get and set scripts to public (from protected) 2020-10-24 13:00:11 -04:00
uiytt
e13694c063 Fixed name 2020-10-23 19:05:32 +02:00
uiytt
f6a3366aac imports order 2020-10-23 17:36:58 +02:00
uiytt
c56a55dd69 Again Formatting fix 
I will never see the end of these things  ...
 2020-10-23 17:31:27 +02:00
uiytt
95a2dc08d4 Formatting fix 2020-10-22 16:06:11 +02:00
TheBusyBiscuit
38bf228012
Merge pull request #2490 from Mooy1/patch-1 
fix empty slot in contributors
 2020-10-20 17:43:09 +02:00
Mooy1
536c5af857 Update ContributorsMenu.java 2020-10-20 10:34:35 -05:00
TheBusyBiscuit
094d4a6ae0
Fixes #2493 2020-10-20 16:45:31 +02:00
Mooy1
4d6d031bca
fix empty slot 2020-10-20 08:56:53 -05:00
CURVX
71ca1458fe Changes req. by TTB 2020-10-20 00:32:20 +05:30
CURVX
f651f960c0 Made ArmorForge extend BackpackCrafter 2020-10-19 22:56:14 +05:30
TheBusyBiscuit
c7960c292c
Merge pull request #2479 from CURVX/fix/ender-boots fixes #2478 
Fixes damage taken from Enderpearl with Enderboot on
 2020-10-19 12:49:58 +02:00
TheBusyBiscuit
1998c7746f
Merge pull request #2477 from J3fftw1/fix/#2470 
fixes #2470
 2020-10-18 19:22:04 +02:00
CURVX
c98292b08c Added changes req. by TTB 2020-10-18 22:32:36 +05:30
Panda.com
766a245a16 whoops 2020-10-18 18:42:12 +02:00
Panda.com
48f45bef02 Whoops 2020-10-18 17:39:54 +02:00
Panda.com
0a4f666094 me dumb 2020-10-18 16:06:19 +02:00
Panda.com
b4cd8e0d0c added Unit Test 2020-10-18 16:01:32 +02:00
Panda.com
e3df3ab012 added tall_flowers.json and requested changes 2020-10-18 15:47:47 +02:00
Panda.com
dc025c7b28 fix 2020-10-18 14:31:54 +02:00
TheBusyBiscuit
734b853eb7 [CI skip] Reduced technical debt 2020-10-18 13:53:15 +02:00
Panda.com
3d364ee331 did requested changes 2020-10-18 13:48:38 +02:00
TheBusyBiscuit
56a1ee5336 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-18 13:17:29 +02:00
TheBusyBiscuit
e054fe6682 Fixes #2448 2020-10-18 13:17:18 +02:00
Nameless
de1e846382 Translate researches_zh-CN.yml via GitLocalize 2020-10-18 02:44:36 +00:00
Nameless
f9d4be9cbb Translate messages_zh-CN.yml via GitLocalize 2020-10-18 02:44:33 +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
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
Timotiyadeyhakesem
ca6962811f Translate categories_he.yml via GitLocalize 2020-10-16 21:57:07 +00:00
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
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
a5ee1cda5a Translate messages_ja.yml via GitLocalize 2020-10-14 22:42:51 +00: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
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +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
TheBusyBiscuit
de1eaca1dc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
bebb514635
Merge pull request #2467 from CURVX/fix/nether-goo-sheep 
Nether Goo "Tainted Sheep"
 2020-10-13 23:27:55 +02:00
TheBusyBiscuit
692fa38246
[CI skip] Merge pull request #2461 from Slimefun/gitlocalize-13398 
Updated Russian localizations
 2020-10-13 23:26:48 +02:00
TheBusyBiscuit
4a53e82414
[CI skip] Merge pull request #2463 from Slimefun/gitlocalize-13432 
Update Japanese translation file.
 2020-10-13 23:25:07 +02:00
TheBusyBiscuit
91cc7ffc99
[CI skip] Merge pull request #2466 from Slimefun/gitlocalize-13824 
Updated Turkish Translations
 2020-10-13 23:24:01 +02:00
TheBusyBiscuit
5c0b7e2ee2 Fixes #2468 2020-10-13 21:44:24 +02:00
CURVX
5982d9faaa Missed extra Parenthesis 2020-10-14 00:58:24 +05:30
CURVX
fdc958b6d8 Changes requested by TBB 2020-10-14 00:45:53 +05:30
TheBusyBiscuit
4a32858ee9 [CI skip] Updated MockBukkit 2020-10-13 20:09:36 +02:00
CURVX
317477cd2c Tainted Sheep 2020-10-13 20:13:44 +05:30
LinoxGH
4b39d6d58b Translate researches_tr.yml via GitLocalize 2020-10-13 13:53:26 +00:00
TheBusyBiscuit
5aa300b0be
Merge pull request #2456 from Sfiguz7/master resolves #2369 
Added Basalt + Blackstone to Crucible
 2020-10-13 01:52:43 +02:00
uiytt
916d2bf4ba Removed empty line 2020-10-12 22:21:33 +02:00
uiytt
cd8603a6d8 Formatting fix 2020-10-12 22:12:37 +02:00
bito-blosh
97e0c660b2 Translate researches_ja.yml via GitLocalize 2020-10-12 18:40:38 +00:00
uiytt
9ded6d1ac4 Added PreCanUnlockResearchEvent 
This event is called when a player click to unlock a research
 2020-10-12 19:19:31 +02:00
TheBusyBiscuit
9e3ce9faf1 [CI skip] Formatting 2020-10-12 16:39:06 +02:00
TheBusyBiscuit
e2101c4ac9 Translate messages_ru.yml via GitLocalize 2020-10-12 14:26:50 +00:00
SoSeDiK
86d94a3122 Translate researches_ru.yml via GitLocalize 2020-10-12 14:26:49 +00:00
Sfiguz7
2a8c0f7f82 Moved imports. 2020-10-12 16:25:22 +02:00
TheBusyBiscuit
9b1d6367b3 Some lore changes 2020-10-12 16:01:27 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector 
Energy Connectors
 2020-10-12 15:49:50 +02:00
TheBusyBiscuit
2e83b726bc [CI skip] Removed author tags from high-cohesion classes 2020-10-12 15:49:33 +02:00
TheBusyBiscuit
160c68b378 [CI skip] Refactoring and documentation 2020-10-12 15:04:27 +02:00
Sfiguz7
6cab415e37 Formatting, nerfed Basalt -> Lava 2020-10-12 14:10:16 +02:00
TheBusyBiscuit
612aad5d95 Fixes #2424 2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164 Fixes #2450 2020-10-12 11:52:23 +02:00