TheBusyBiscuit
|
1141a01fd0
|
Fixes #2519
|
2020-11-01 20:46:29 +01:00 |
|
HeroBrineKing
|
519140ede6
|
Translate resources_zh-TW.yml via GitLocalize
|
2020-10-31 11:50:41 +00:00 |
|
HeroBrineKing
|
36460ed11f
|
Translate researches_zh-TW.yml via GitLocalize
|
2020-10-31 11:50:40 +00:00 |
|
HeroBrineKing
|
7ecdbbc97d
|
Translate recipes_zh-TW.yml via GitLocalize
|
2020-10-31 11:50:39 +00:00 |
|
TheBusyBiscuit
|
935a36cfbd
|
Translate messages_zh-TW.yml via GitLocalize
|
2020-10-31 11:50:36 +00:00 |
|
HeroBrineKing
|
5fafac0f84
|
Translate categories_zh-TW.yml via GitLocalize
|
2020-10-31 11:50:35 +00:00 |
|
TheBusyBiscuit
|
3bf7dfc1c3
|
Update recipes_ko.yml
|
2020-10-31 10:17:59 +01:00 |
|
20181241
|
aa29c33625
|
Translate recipes_ko.yml via GitLocalize
|
2020-10-31 09:15:24 +00:00 |
|
TheBusyBiscuit
|
192258fb74
|
Merge branch 'master' into MoreTalismans
|
2020-10-30 22:54:36 +01:00 |
|
svr333
|
33f0d0a4bc
|
Change not-valid to invalid
|
2020-10-29 15:06:52 +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
|
094d4a6ae0
|
Fixes #2493
|
2020-10-20 16:45:31 +02:00 |
|
TheBusyBiscuit
|
1998c7746f
|
Merge pull request #2477 from J3fftw1/fix/#2470
fixes #2470
|
2020-10-18 19:22:04 +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 |
|
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 |
|
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
|
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 |
|
Timotiyadeyhakesem
|
ca6962811f
|
Translate categories_he.yml via GitLocalize
|
2020-10-16 21:57:07 +00: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 |
|
Pierre
|
36ccb4e5eb
|
Translate messages_fr.yml via GitLocalize
|
2020-10-15 11:51:12 +00: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 |
|
TheBusyBiscuit
|
b88bad3ef6
|
Fixes #2452
|
2020-10-14 14:56:52 +02:00 |
|
TheBusyBiscuit
|
8440143f41
|
Refactoring
|
2020-10-14 13:20:12 +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
|
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 |
|
LinoxGH
|
4b39d6d58b
|
Translate researches_tr.yml via GitLocalize
|
2020-10-13 13:53:26 +00: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 |
|
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 |
|
TheBusyBiscuit
|
87d319cd02
|
Merge pull request #2382 from LinoxGH/EnergyConnector
Energy Connectors
|
2020-10-12 15:49:50 +02:00 |
|
Senne Van Rompaey
|
4d474de290
|
Merge branch 'master' into MoreTalismans
|
2020-10-12 00:57:11 +02:00 |
|
TheBusyBiscuit
|
86b46939d1
|
[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359
new translations
|
2020-10-11 01:36:41 +02:00 |
|
Pierre
|
b7da3d816d
|
Translate messages_fr.yml via GitLocalize
|
2020-10-10 23:22:55 +00:00 |
|
Pierre
|
1fb8a2f66c
|
Translate researches_fr.yml via GitLocalize
|
2020-10-10 23:22:38 +00:00 |
|
LinoxGH
|
ad505b6cef
|
Merge branch 'master' into EnergyConnector
|
2020-10-11 00:26:43 +03:00 |
|
TheBusyBiscuit
|
fa1cecef2f
|
[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355
Updated bulgarian translations
|
2020-10-10 19:44:00 +02:00 |
|
TheBusyBiscuit
|
6434c79a0a
|
Translate messages_de.yml via GitLocalize
|
2020-10-10 17:33:22 +00:00 |
|
TheBusyBiscuit
|
1088aea40e
|
Translate researches_de.yml via GitLocalize
|
2020-10-10 17:33:20 +00:00 |
|
DNBGlol
|
01fc7cd536
|
Translate categories_bg.yml via GitLocalize
|
2020-10-10 17:28:03 +00:00 |
|
DNBGlol
|
c2ca5a1ea5
|
Translate resources_bg.yml via GitLocalize
|
2020-10-10 17:28:02 +00:00 |
|
TheBusyBiscuit
|
44e6449f9e
|
Merge pull request #2430 from Slimefun/gitlocalize-13351
Update messages_nl.yml
|
2020-10-10 15:27:19 +02:00 |
|
TheBusyBiscuit
|
c9ca11c62c
|
[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352
Update recipes_nl.yml
|
2020-10-10 15:26:19 +02:00 |
|
Senne Van Rompaey
|
47d39cdc3c
|
Translate categories_nl.yml via GitLocalize
|
2020-10-10 13:12:28 +00:00 |
|
milvantiou
|
025021f5b5
|
Translate categories_nl.yml via GitLocalize
|
2020-10-10 13:12:27 +00:00 |
|
Sven313D
|
af608e3c13
|
Translate recipes_nl.yml via GitLocalize
|
2020-10-10 12:42:09 +00:00 |
|
Senne Van Rompaey
|
e80b3b64d2
|
Translate messages_nl.yml via GitLocalize
|
2020-10-10 12:27:12 +00:00 |
|
TheBusyBiscuit
|
4c47a9cb93
|
Merge pull request #2298 from Slimefun/tags
Implemented Tags
|
2020-10-10 13:38:48 +02:00 |
|
TheBusyBiscuit
|
cf6add1149
|
Some small improvements before the merge
|
2020-10-10 13:36:07 +02:00 |
|
TheBusyBiscuit
|
c03b54c2c3
|
[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345
Updated Hungarian translations
|
2020-10-10 01:25:10 +02:00 |
|
LinoxGH
|
26d46c2dc9
|
Translate researches_tr.yml via GitLocalize
|
2020-10-09 14:48:14 +00:00 |
|
LinoxGH
|
7e3866a25b
|
Translate messages_tr.yml via GitLocalize
|
2020-10-09 14:48:12 +00:00 |
|
poma123
|
72f7441a18
|
Small fixes
|
2020-10-09 16:36:25 +02:00 |
|
poma123
|
b7b7fa8a34
|
Translate researches_hu.yml via GitLocalize
|
2020-10-09 14:30:47 +00:00 |
|
poma123
|
076f1b51a4
|
Translate resources_hu.yml via GitLocalize
|
2020-10-09 14:30:45 +00:00 |
|
poma123
|
5ac0792cb0
|
Translate recipes_hu.yml via GitLocalize
|
2020-10-09 14:30:43 +00:00 |
|
poma123
|
f3fafaff26
|
Translate categories_hu.yml via GitLocalize
|
2020-10-09 14:30:42 +00:00 |
|
poma123
|
bd0f15bc95
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:38 +00:00 |
|
bito-blosh
|
3e20911c48
|
Translate researches_ja.yml via GitLocalize
|
2020-10-09 12:13:19 +00:00 |
|
TheBusyBiscuit
|
c440fd0778
|
Translate messages_ja.yml via GitLocalize
|
2020-10-09 12:13:17 +00:00 |
|
svr333
|
b042fbd3a4
|
Add check for ProtectionManagers
|
2020-10-08 22:34:18 +02:00 |
|
svr333
|
172dfc0610
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans
|
2020-10-08 18:22:23 +02:00 |
|
TheBusyBiscuit
|
2d00f3e704
|
Merge branch 'master' into tags
|
2020-10-08 16:16:11 +02:00 |
|
LinoxGH
|
4bf08db1d1
|
Merge branch 'master' into EnergyConnector
|
2020-10-08 15:53:08 +03:00 |
|
TheBusyBiscuit
|
01d233af4d
|
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix
GPS Control Panel and GEO Scanner access checks
|
2020-10-08 14:37:16 +02:00 |
|
TheBusyBiscuit
|
08ed8b21c8
|
Merge branch 'bee-armor' into beeArmor
|
2020-10-07 22:14:39 +02:00 |
|
NCBPFluffyBear
|
b577c1e4a3
|
Did changes
|
2020-10-07 13:45:49 -05:00 |
|
LinoxGH
|
eb572a1a77
|
Merge branch 'master' into EnergyConnector
|
2020-10-07 18:10:50 +03:00 |
|
poma123
|
7814bdcdee
|
Merge branch 'master' into tags
|
2020-10-07 16:11:41 +02:00 |
|
Senne Van Rompaey
|
085ad2cd6b
|
Merge branch 'master' into MoreTalismans
|
2020-10-07 16:06:32 +02:00 |
|
svr333
|
a9b8f608ff
|
Attempt to make it work
|
2020-10-07 15:54:32 +02:00 |
|
TheBusyBiscuit
|
47590ac972
|
Merge branch 'master' into tags
|
2020-10-06 21:07:49 +02:00 |
|
Seggan
|
bb24bdd837
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-05 10:55:26 -04:00 |
|
svr333
|
d64fe94b50
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans
|
2020-10-05 15:58:32 +02:00 |
|
svr333
|
64e39abc62
|
Update resurrected talisman message
|
2020-10-05 12:13:46 +02:00 |
|
Om Uparkar
|
bf625c3371
|
corrected spelling mistakes and stuff in wiki.json
|
2020-10-05 11:55:53 +05:30 |
|
Seggan
|
3dcd5942aa
|
Changed some linguistic things (Biscuit needs to be an English professor)
|
2020-10-04 22:03:48 -04:00 |
|
Om Uparkar
|
12038c2c96
|
updated wiki.json
|
2020-10-05 03:35:03 +05:30 |
|
Senne Van Rompaey
|
207d69a09b
|
Uppercase talisman
|
2020-10-04 20:56:34 +02:00 |
|
Senne Van Rompaey
|
ef12fc3d01
|
Add text entries for resurrected_talisman
|
2020-10-04 20:29:14 +02:00 |
|
TheBusyBiscuit
|
655b429f0d
|
Added a new super tag
|
2020-10-04 13:31:52 +02:00 |
|
LinoxGH
|
6347e2f6ca
|
Merge branch 'master' into beeArmor
|
2020-10-04 08:48:05 +03:00 |
|
TheBusyBiscuit
|
8bbdc37130
|
Refactored Climbing Picks and added Tags
|
2020-10-04 02:28:59 +02:00 |
|
Senne Van Rompaey
|
aefb51cc27
|
Add text entries for wise_talisman
|
2020-10-03 22:57:20 +02:00 |
|
Seggan
|
23efd62c49
|
Added crash helmet listener and research
|
2020-10-03 16:31:27 -04:00 |
|
TheBusyBiscuit
|
e1a8c6f52e
|
Added caveman talisman tag
|
2020-10-03 22:21:01 +02:00 |
|
LinoxGH
|
4b2f70203c
|
Merge branch 'master' into EnergyConnector
|
2020-10-03 23:19:04 +03:00 |
|
poma123
|
3ec39ec16a
|
Merge branch 'master' into tags
|
2020-10-03 21:46:28 +02:00 |
|
TheBusyBiscuit
|
b6a3b38294
|
Merge pull request #2377 from poma123/fix/cartography-table fixes #2357
Cartography Table fix
|
2020-10-03 21:29:26 +02:00 |
|
LinoxGH
|
f6492e74fb
|
Added the research to language files.
|
2020-10-03 21:48:36 +03:00 |
|
Senne Van Rompaey
|
178fc6eb22
|
Rename Hastier to Caveman
|
2020-10-03 16:52:49 +02:00 |
|
Senne Van Rompaey
|
357f325792
|
Add message entry for hastier talisman
|
2020-10-02 22:04:21 +02:00 |
|
Senne Van Rompaey
|
4692bce343
|
Add entry to researches_en
|
2020-10-02 21:53:53 +02:00 |
|
poma123
|
76bc9b1192
|
Fixed capitalization
|
2020-10-01 21:25:56 +02:00 |
|
poma123
|
30603d9bf5
|
Added an EventHandler for Cartography Table
|
2020-10-01 19:12:09 +02:00 |
|
TheBusyBiscuit
|
d4c26f20f0
|
Merge branch 'master' into beeArmor
|
2020-09-21 15:59:56 +02:00 |
|
TheBusyBiscuit
|
4412b40709
|
Merge branch 'master' into tags
|
2020-09-21 15:59:08 +02:00 |
|
Seggan
|
5857b85199
|
Added research text
|
2020-09-20 12:52:16 -04:00 |
|
TheBusyBiscuit
|
23bf314905
|
Added fluid-sensitive tag
|
2020-09-19 11:39:35 +02:00 |
|
TheBusyBiscuit
|
a98ff148e6
|
Jigsaw!
|
2020-09-13 12:06:43 +02:00 |
|
TheBusyBiscuit
|
b14f0b76c0
|
Added unbreakable tag
|
2020-09-13 12:00:45 +02:00 |
|
poma123
|
12b32b0856
|
Merge remote-tracking branch 'upstream/master' into pr/1909
|
2020-09-12 12:27:24 +02:00 |
|
TheBusyBiscuit
|
ed66ee9b79
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
CHANGELOG.md
|
2020-09-11 10:33:02 +02:00 |
|
TheBusyBiscuit
|
74edbe499c
|
Fixes #2238
|
2020-09-11 00:07:26 +02:00 |
|
NCBPFluffyBear
|
6b95ed0293
|
Added Charge Command
|
2020-09-10 16:02:03 -05:00 |
|
TheBusyBiscuit
|
8a3165e9ba
|
Fixed some tags and added glass
|
2020-09-10 00:33:47 +02:00 |
|
TheBusyBiscuit
|
81a8732f41
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-09-07 13:06:50 +02:00 |
|
TheBusyBiscuit
|
4fe2aee565
|
Another mistake
|
2020-09-07 13:00:15 +02:00 |
|
TheBusyBiscuit
|
7e7fde9a47
|
Slight correction
|
2020-09-07 12:59:38 +02:00 |
|
TheBusyBiscuit
|
3220a124aa
|
Added more Unit Tests
|
2020-09-07 12:41:04 +02:00 |
|
TheBusyBiscuit
|
5b72faddc3
|
Implemented tags
|
2020-09-07 11:08:39 +02:00 |
|
TheBusyBiscuit
|
06498e3f63
|
Added Unit Test and loop detection
|
2020-09-07 01:13:25 +02:00 |
|
TheBusyBiscuit
|
773996617d
|
Added Tags
|
2020-09-07 00:31:26 +02:00 |
|
TheBusyBiscuit
|
5c0aba7692
|
[CI skip] Moved Slimefun repository
|
2020-09-06 17:19:02 +02:00 |
|
Nameless
|
3b9a42713a
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-09-06 04:24:14 +00:00 |
|
TheBusyBiscuit
|
4ef4332ffa
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-09-06 04:24:10 +00:00 |
|
TheBusyBiscuit
|
5f897de0b0
|
[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867
messges_es
|
2020-09-05 09:57:06 +02:00 |
|
Luu7
|
1c1b2251d0
|
Translate researches_es.yml via GitLocalize
|
2020-09-04 20:21:14 +00:00 |
|
Luu7
|
d11145d98c
|
Translate messages_es.yml via GitLocalize
|
2020-09-04 20:09:41 +00:00 |
|
TheBusyBiscuit
|
120d3299ee
|
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841
New pull request
|
2020-09-04 10:02:31 +02:00 |
|
Pierre
|
1ee04e79b3
|
Translate messages_fr.yml via GitLocalize
|
2020-09-03 22:17:25 +00:00 |
|
amarcais53
|
d22c14e5a6
|
Translate researches_fr.yml via GitLocalize
|
2020-09-03 18:23:24 +00:00 |
|
TheBusyBiscuit
|
cc2dd0dd64
|
Translate messages_ja.yml via GitLocalize
|
2020-09-03 05:32:59 +00:00 |
|
bito-blosh
|
af89dba9f6
|
Translate researches_ja.yml via GitLocalize
|
2020-09-03 05:32:27 +00:00 |
|
TheBusyBiscuit
|
d0498f51c5
|
Translate messages_de.yml via GitLocalize
|
2020-09-02 10:13:36 +00:00 |
|
TheBusyBiscuit
|
2dfa2f139b
|
Translate researches_de.yml via GitLocalize
|
2020-09-02 10:13:35 +00:00 |
|
LinoxGH
|
4fde84d521
|
Translate researches_tr.yml via GitLocalize
|
2020-09-02 10:06:23 +00:00 |
|
LinoxGH
|
7db615fb82
|
Translate messages_tr.yml via GitLocalize
|
2020-09-02 10:06:20 +00:00 |
|
TheBusyBiscuit
|
486253973c
|
Renamed to Villager Rune
|
2020-09-02 11:16:45 +02:00 |
|
TheBusyBiscuit
|
4bc22ab106
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental
Conflicts:
CHANGELOG.md
|
2020-08-24 21:12:04 +02:00 |
|
TheBusyBiscuit
|
8c2038634f
|
Fixed dual wielding climbing picks and added messages
|
2020-08-24 20:31:54 +02:00 |
|
Sfiguz7
|
e06d17f8e5
|
Restored original plugin.yml as pulling hadn't
|
2020-08-23 13:58:29 +02:00 |
|
Sfiguz7
|
eb66f3e183
|
Added option to drop excess items on /sf give
|
2020-08-23 13:54:51 +02:00 |
|
100petr
|
d6e519c840
|
Translate messages_cs.yml via GitLocalize
|
2020-08-21 13:27:22 +00:00 |
|
TheBusyBiscuit
|
29092b87c9
|
Merge branch 'experimental' into IcePick
|
2020-08-20 22:56:09 +02:00 |
|
TheBusyBiscuit
|
d8d4811974
|
Merged Nitwit Rune and Shulker Shell PRs
|
2020-08-20 18:20:25 +02:00 |
|
TheBusyBiscuit
|
65021f7615
|
Merge branch 'rune' into ShulkerShell
|
2020-08-20 17:33:27 +02:00 |
|
LinoxGH
|
a54e8623d3
|
Merge branch 'master' into ShulkerShell
|
2020-08-20 12:21:50 +03:00 |
|
LinoxGH
|
5f78e7a854
|
Merge branch 'master' into IcePick
|
2020-08-20 11:43:14 +03:00 |
|
Vravinite
|
310622c3ac
|
Translate messages_es.yml via GitLocalize
|
2020-08-19 23:50:04 +00:00 |
|
LinoxGH
|
5f0df75b81
|
Translate messages_tr.yml via GitLocalize
|
2020-08-19 12:42:33 +00:00 |
|
TheBusyBiscuit
|
4f3854877b
|
[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659
Updated Russian localizations
|
2020-08-19 14:37:35 +02:00 |
|
TheBusyBiscuit
|
15487fb333
|
Translate messages_de.yml via GitLocalize
|
2020-08-19 12:33:36 +00:00 |
|
SoSeDiK
|
273e459e26
|
Translate recipes_ru.yml via GitLocalize
|
2020-08-19 12:20:10 +00:00 |
|
SoSeDiK
|
dbd5cc1641
|
Translate messages_ru.yml via GitLocalize
|
2020-08-19 12:20:08 +00:00 |
|
TheBusyBiscuit
|
57b3f06aa6
|
Merge pull request #2220 from dniym/NitwitRune
Added Rune of Unemployment
|
2020-08-19 13:58:16 +02:00 |
|
TheBusyBiscuit
|
9d4d2060ba
|
[CI skip] Added a few more strings to translation files
|
2020-08-18 14:45:51 +02:00 |
|
Scott Gomez Andoy
|
646fb6d523
|
Translate messages_tl.yml via GitLocalize
|
2020-08-17 11:26:10 +00:00 |
|
TheBusyBiscuit
|
0d27a787ab
|
Added a new config option for setting Players on fire when radioactive
|
2020-08-17 02:23:59 +02:00 |
|
TheBusyBiscuit
|
c98fe74ea9
|
Merge branch 'master' into NitwitRune
|
2020-08-17 00:25:18 +02:00 |
|
dniym
|
b22bdb55ff
|
Made requested changes
|
2020-08-16 13:33:36 -04:00 |
|
Luu7
|
9a6b8d697d
|
Translate messages_es.yml via GitLocalize
|
2020-08-14 21:53:14 +00:00 |
|
TheBusyBiscuit
|
bae8421511
|
Translate messages_de.yml via GitLocalize
|
2020-08-13 23:51:00 +00:00 |
|
LinoxGH
|
acfc3c6880
|
Translate messages_tr.yml via GitLocalize
|
2020-08-13 19:53:13 +00:00 |
|
TheBusyBiscuit
|
c0d18c5c89
|
Fixes #2217
|
2020-08-13 21:13:19 +02:00 |
|
dniym
|
a1be08034b
|
made requested changes
|
2020-08-12 16:04:35 -04:00 |
|
dniym
|
b27059240b
|
Added Rune of Unemployment
Approved Suggestion: #284 - Vitamin_CE#9804
|
2020-08-11 20:58:17 -04:00 |
|
Nameless
|
517bd6139e
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-08-10 06:47:24 +00:00 |
|
LinoxGH
|
9175f27fdd
|
Translate messages_tr.yml via GitLocalize
|
2020-08-09 14:59:09 +00:00 |
|
Luu7
|
adddf4811d
|
Translate messages_es.yml via GitLocalize
|
2020-08-09 13:07:04 +00:00 |
|
TheBusyBiscuit
|
bb40017985
|
Translate messages_de.yml via GitLocalize
|
2020-08-09 09:48:03 +00:00 |
|
TheBusyBiscuit
|
e4f5ea62d9
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-09 11:44:03 +02:00 |
|
TheBusyBiscuit
|
66f4c48b4b
|
Fixes #2205
|
2020-08-09 11:33:48 +02:00 |
|
TheBusyBiscuit
|
e6958f8e34
|
[CI skip] Merge pull request #2210 from TheBusyBiscuit/gitlocalize-12575
Updated messages_zh-CN.yml
|
2020-08-09 11:20:57 +02:00 |
|
Nameless
|
af32c0ed4a
|
Translate recipes_zh-CN.yml via GitLocalize
|
2020-08-09 08:20:48 +00:00 |
|
Nameless
|
a3f58150ee
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-08-09 08:17:17 +00:00 |
|
Vravinite
|
b0c040ea7a
|
Translate recipes_es.yml via GitLocalize
|
2020-08-06 07:47:06 +00:00 |
|
Luu7
|
4a45757a53
|
Translate messages_es.yml via GitLocalize
|
2020-08-06 07:47:03 +00:00 |
|
Luu7
|
33d802b940
|
Translate researches_es.yml via GitLocalize
|
2020-08-06 07:47:02 +00:00 |
|
TheBusyBiscuit
|
dde0ab7de6
|
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544
Updated hungarian translations
|
2020-08-05 23:39:44 +02:00 |
|
TheBusyBiscuit
|
94843c79c0
|
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540
Update Japanese translation
|
2020-08-05 23:39:18 +02:00 |
|
TheBusyBiscuit
|
a032d151f1
|
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539
Updated TR localization
|
2020-08-05 23:38:52 +02:00 |
|
TheBusyBiscuit
|
e758be8d3c
|
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538
Tagalog/Filipino Translation Update
|
2020-08-05 23:38:28 +02:00 |
|
poma123
|
f89f3a35bb
|
Translate messages_hu.yml via GitLocalize
|
2020-08-05 21:36:36 +00:00 |
|
András Marczinkó
|
9594046bd5
|
Translate recipes_hu.yml via GitLocalize
|
2020-08-05 21:36:35 +00:00 |
|
TheBusyBiscuit
|
c2cc7ab96c
|
Translate messages_ja.yml via GitLocalize
|
2020-08-05 15:38:07 +00:00 |
|
LinoxGH
|
cd7a94516a
|
Translate messages_tr.yml via GitLocalize
|
2020-08-05 15:06:58 +00:00 |
|
Scott Gomez Andoy
|
a0fe200948
|
Translate messages_tl.yml via GitLocalize
|
2020-08-05 14:54:16 +00:00 |
|
TheBusyBiscuit
|
3d8e01e6f2
|
Translate messages_de.yml via GitLocalize
|
2020-08-05 14:52:33 +00:00 |
|
poma123
|
6de4130d05
|
Fixed prevention when brewing with slimefun items
|
2020-08-05 12:41:48 +02:00 |
|
TheBusyBiscuit
|
c56ebe9c23
|
Merge branch 'master' into IcePick
|
2020-08-04 19:12:00 +02:00 |
|
Scott Gomez Andoy
|
927eefd63c
|
Translate recipes_tl.yml via GitLocalize
|
2020-08-04 12:46:42 +00:00 |
|
TheBusyBiscuit
|
736b48a799
|
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525
Added korean as a language
|
2020-08-04 12:54:45 +02:00 |
|
TheBusyBiscuit
|
14f0b0f3fe
|
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523
Updated german translation
|
2020-08-04 12:54:20 +02:00 |
|
kwonms871
|
b41ef97859
|
Translate messages_ko.yml via GitLocalize
|
2020-08-04 10:48:38 +00:00 |
|
LinoxGH
|
bdde1d9745
|
Translate recipes_tr.yml via GitLocalize
|
2020-08-04 10:45:39 +00:00 |
|
TheBusyBiscuit
|
c2443a4df2
|
Translate recipes_de.yml via GitLocalize
|
2020-08-04 10:44:15 +00:00 |
|
TheBusyBiscuit
|
e870f82afd
|
Added piglin bartering to translation files
|
2020-08-04 12:40:08 +02:00 |
|
kudansul
|
f3191658b8
|
Translate researches_ko.yml via GitLocalize
|
2020-08-02 11:46:07 +00:00 |
|
TheBusyBiscuit
|
0f924e485b
|
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482
Categories_it
|
2020-08-01 16:58:41 +02:00 |
|
prolletto64
|
bf3a0391d0
|
Translate categories_it.yml via GitLocalize
|
2020-07-31 13:43:17 +00:00 |
|
prolletto64
|
db424e0437
|
Translate researches_it.yml via GitLocalize
|
2020-07-31 13:41:59 +00:00 |
|
Scott Gomez Andoy
|
5d22bfb109
|
Translate recipes_tl.yml via GitLocalize
|
2020-07-30 23:59:34 +00:00 |
|
TheBusyBiscuit
|
90685edae6
|
Added a permission node for the debug fish
|
2020-07-31 01:32:43 +02:00 |
|
SoSeDiK
|
8ddb055083
|
Translate researches_ru.yml via GitLocalize
|
2020-07-30 11:45:13 +00:00 |
|
SoSeDiK
|
2999e777f9
|
Translate messages_ru.yml via GitLocalize
|
2020-07-30 11:45:09 +00:00 |
|
TheBusyBiscuit
|
771456b6cd
|
[CI skip] Fixed some malformed yaml
|
2020-07-30 13:30:20 +02:00 |
|
TheBusyBiscuit
|
a363cd1f5f
|
[CI skip] Removed trailing-spaces from config
|
2020-07-30 13:24:56 +02:00 |
|
Nameless
|
08412f3c6c
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-07-28 01:16:18 +00:00 |
|
Nameless
|
641d24d48d
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-07-28 01:16:15 +00:00 |
|
TheBusyBiscuit
|
3573628621
|
Translate messages_hu.yml via GitLocalize
|
2020-07-26 23:00:23 +00:00 |
|
András Marczinkó
|
d01dadfa42
|
Translate researches_hu.yml via GitLocalize
|
2020-07-26 23:00:22 +00:00 |
|
bito-blosh
|
d1224b2d44
|
Translate resources_ja.yml via GitLocalize
|
2020-07-25 23:03:32 +00:00 |
|
bito-blosh
|
cb439b5aee
|
Translate messages_ja.yml via GitLocalize
|
2020-07-25 23:03:31 +00:00 |
|
bito-blosh
|
9e317e8c4e
|
Translate researches_ja.yml via GitLocalize
|
2020-07-25 23:03:30 +00:00 |
|
TheBusyBiscuit
|
c717c0e4ce
|
[CI skip] Merge pull request #2130 from TheBusyBiscuit/gitlocalize-12447
Updated researches for chinese (Taiwan)
|
2020-07-25 15:39:47 +02:00 |
|
LinoxGH
|
8844ec17d7
|
Translate researches_tr.yml via GitLocalize
|
2020-07-25 13:36:45 +00:00 |
|
LinoxGH
|
8230987cfc
|
Translate messages_tr.yml via GitLocalize
|
2020-07-25 13:36:44 +00:00 |
|
HeroBrineKing
|
191c4ffa60
|
Translate researches_zh-TW.yml via GitLocalize
|
2020-07-25 13:33:44 +00:00 |
|
Scott Gomez Andoy
|
8792d8eace
|
Translate researches_tl.yml via GitLocalize
|
2020-07-25 13:19:02 +00:00 |
|
Scott Gomez Andoy
|
9d1b307568
|
Translate messages_tl.yml via GitLocalize
|
2020-07-25 13:19:00 +00:00 |
|
MeerBiene
|
85d7cb0f69
|
Translate researches_de.yml via GitLocalize
|
2020-07-25 13:15:18 +00:00 |
|
TheBusyBiscuit
|
5b706ca6b3
|
Translate messages_de.yml via GitLocalize
|
2020-07-25 13:15:17 +00:00 |
|
TheBusyBiscuit
|
17cd55bf53
|
Merge pull request #2072 from TheBusyBiscuit/experimental
Merge of "experimental" branch
|
2020-07-25 15:07:47 +02:00 |
|
Scott Gomez Andoy
|
30e1a6ce0a
|
Translate messages_tl.yml via GitLocalize
|
2020-07-25 12:41:27 +00:00 |
|
TheBusyBiscuit
|
92ca696140
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental
Conflicts:
CHANGELOG.md
|
2020-07-25 14:27:12 +02:00 |
|
TheBusyBiscuit
|
20372f7e05
|
[CI skip] Merge pull request #2125 from TheBusyBiscuit/gitlocalize-12442
Updated Ukrainian localizations
|
2020-07-25 14:23:10 +02:00 |
|
TheBusyBiscuit
|
583a971c4f
|
[CI skip] Merge pull request #2124 from TheBusyBiscuit/gitlocalize-12441
Updated Russian localizations
|
2020-07-25 14:22:44 +02:00 |
|
TheBusyBiscuit
|
6374f09d29
|
Translate messages_de.yml via GitLocalize
|
2020-07-25 12:21:58 +00:00 |
|
SoSeDiK
|
77f5224d14
|
Translate messages_uk.yml via GitLocalize
|
2020-07-25 12:05:24 +00:00 |
|
SoSeDiK
|
c6db53205c
|
Translate messages_ru.yml via GitLocalize
|
2020-07-25 12:04:24 +00:00 |
|
LinoxGH
|
b68227b7b8
|
Translate messages_tr.yml via GitLocalize
|
2020-07-25 12:03:34 +00:00 |
|
TheBusyBiscuit
|
ebce279cf2
|
Merge pull request #2121 from poma123/patch-2 fixes #2097
Fixed piglin SlimefunItem pickup
|
2020-07-25 13:56:58 +02:00 |
|