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 |
|
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
|
8dfb235488
|
[CI skip] Updated changelog
|
2020-10-13 23:21:15 +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
|
c4640f1328
|
Translate recipes_tr.yml via GitLocalize
|
2020-10-13 13:53:27 +00:00 |
|
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 |
|
TheBusyBiscuit
|
eeffb30f4a
|
[CI skip] Updated changelog
|
2020-10-13 01:52:07 +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 |
|
Senne Van Rompaey
|
db95cca3fb
|
Merge branch 'master' into MoreTalismans
|
2020-10-12 19:59:16 +02: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 |
|
SoSeDiK
|
42b31a6fa1
|
Translate messages_ru.yml via GitLocalize
|
2020-10-12 14:26:51 +00: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 |
|
CURVX
|
b778e2158b
|
Merge pull request #2 from Slimefun/master
[CI Skip] Update fork
|
2020-10-12 19:04:58 +05:30 |
|
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 |
|
TheBusyBiscuit
|
14e18d2962
|
Fixes #2455
|
2020-10-12 11:47:13 +02:00 |
|
Sfiguz7
|
fd58155a18
|
Added blackstone and basalt -> lava to crucibles
|
2020-10-12 09:10:52 +02:00 |
|
Senne Van Rompaey
|
4d474de290
|
Merge branch 'master' into MoreTalismans
|
2020-10-12 00:57:11 +02:00 |
|