TheBusyBiscuit
|
c684ad9249
|
Update CHANGELOG.md
|
2020-08-20 18:23:12 +02:00 |
|
TheBusyBiscuit
|
d8d4811974
|
Merged Nitwit Rune and Shulker Shell PRs
|
2020-08-20 18:20:25 +02:00 |
|
TheBusyBiscuit
|
c9521c4784
|
Merge pull request #2037 from LinoxGH/ShulkerShell
Synthetic Shulker shells
|
2020-08-20 17:34:30 +02:00 |
|
TheBusyBiscuit
|
65021f7615
|
Merge branch 'rune' into ShulkerShell
|
2020-08-20 17:33:27 +02:00 |
|
TheBusyBiscuit
|
88be3e79ff
|
Merge branch 'master' into refactoring/block-energy
|
2020-08-20 16:55:35 +02:00 |
|
LinoxGH
|
73d623a0fd
|
Github Web and its indent issues.
|
2020-08-20 14:39:31 +03:00 |
|
LinoxGH
|
37bacaa8cb
|
Apparently SlimefunPlugin.instance is private now.
|
2020-08-20 14:30:21 +03:00 |
|
LinoxGH
|
bf3b04a4c5
|
Oops sorry for this silly mistake
|
2020-08-20 14:19:48 +03:00 |
|
LinoxGH
|
0946b88cd1
|
Fixed symbol name issues in ClimbingPick.java
|
2020-08-20 14:11:46 +03: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 |
|
TheBusyBiscuit
|
1a8dbb587a
|
[CI skip] Merge pull request #2233 from TheBusyBiscuit/gitlocalize-12678
messges_es
|
2020-08-20 09:20:38 +02:00 |
|
Luu7
|
fc7587b517
|
Translate messages_es.yml via GitLocalize
|
2020-08-19 23:50:05 +00:00 |
|
Vravinite
|
310622c3ac
|
Translate messages_es.yml via GitLocalize
|
2020-08-19 23:50:04 +00:00 |
|
TheBusyBiscuit
|
3feb16e9e4
|
[CI skip] Merge pull request #2232 from TheBusyBiscuit/gitlocalize-12661
Updated TR localization
|
2020-08-19 14:43:53 +02:00 |
|
LinoxGH
|
5f0df75b81
|
Translate messages_tr.yml via GitLocalize
|
2020-08-19 12:42:33 +00:00 |
|
LinoxGH
|
04214ed113
|
Translate recipes_tr.yml via GitLocalize
|
2020-08-19 12:42:32 +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
|
f84a69b77f
|
[CI skip] Merge pull request #2231 from TheBusyBiscuit/gitlocalize-12660
Updated german translations
|
2020-08-19 14:35:48 +02:00 |
|
TheBusyBiscuit
|
15487fb333
|
Translate messages_de.yml via GitLocalize
|
2020-08-19 12:33:36 +00:00 |
|
TheBusyBiscuit
|
9787cf734b
|
Renamed to Nitwit Rune
|
2020-08-19 14:31:07 +02:00 |
|
SoSeDiK
|
273e459e26
|
Translate recipes_ru.yml via GitLocalize
|
2020-08-19 12:20:10 +00:00 |
|
TheBusyBiscuit
|
4429bd3c70
|
Translate messages_ru.yml via GitLocalize
|
2020-08-19 12:20:09 +00:00 |
|
SoSeDiK
|
dbd5cc1641
|
Translate messages_ru.yml via GitLocalize
|
2020-08-19 12:20:08 +00:00 |
|
TheBusyBiscuit
|
b1abf7bb99
|
Fixed categories
|
2020-08-19 14:12:51 +02:00 |
|
TheBusyBiscuit
|
8c5d15e311
|
Increased Bartering chance
|
2020-08-19 14:11:33 +02:00 |
|
TheBusyBiscuit
|
66fa277014
|
A few additional changes
|
2020-08-19 14:07:42 +02:00 |
|
TheBusyBiscuit
|
57b3f06aa6
|
Merge pull request #2220 from dniym/NitwitRune
Added Rune of Unemployment
|
2020-08-19 13:58:16 +02:00 |
|
TheBusyBiscuit
|
aa22e7c9b2
|
[CI skip] A bit of refactoring and documentation
|
2020-08-19 13:54:46 +02:00 |
|
TheBusyBiscuit
|
21c97eba9a
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-19 11:00:12 +02:00 |
|
TheBusyBiscuit
|
5c5c20ff23
|
[CI skip] Merge pull request #2229 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.2
|
2020-08-19 10:26:42 +02:00 |
|
Renovate Bot
|
9f4c34e826
|
Update dependency org.mockito:mockito-core to v3.5.2
|
2020-08-18 21:24:32 +00:00 |
|
dniym
|
e13e7e1400
|
Update RuneOfUnemployment.java
made requested changes
|
2020-08-18 15:30:12 -04:00 |
|
TheBusyBiscuit
|
9d4d2060ba
|
[CI skip] Added a few more strings to translation files
|
2020-08-18 14:45:51 +02:00 |
|
TheBusyBiscuit
|
6be0709aea
|
Fixes #2138
|
2020-08-18 14:18:44 +02:00 |
|
TheBusyBiscuit
|
85b0c80e3f
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-17 17:31:39 +02:00 |
|
TheBusyBiscuit
|
8e8a87fce6
|
Fixed ChestTerminal timings showing up as cargo nodes
|
2020-08-17 17:31:15 +02:00 |
|
TheBusyBiscuit
|
fb47574fe8
|
Added poma's requested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
|
2020-08-17 16:27:26 +02:00 |
|
TheBusyBiscuit
|
a10813036b
|
Added poma's suggested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
|
2020-08-17 13:30:18 +02:00 |
|
TheBusyBiscuit
|
0f73b62658
|
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2020-08-17 13:30:03 +02:00 |
|
TheBusyBiscuit
|
07c62d5932
|
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2020-08-17 13:29:54 +02:00 |
|
TheBusyBiscuit
|
33f6f039ec
|
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2020-08-17 13:29:44 +02:00 |
|
TheBusyBiscuit
|
925ade1d04
|
[CI skip] Merge pull request #2227 from TheBusyBiscuit/gitlocalize-12643
Tagalog/Filipino Translation Update
|
2020-08-17 13:28:35 +02:00 |
|
Scott Gomez Andoy
|
646fb6d523
|
Translate messages_tl.yml via GitLocalize
|
2020-08-17 11:26:10 +00:00 |
|
TheBusyBiscuit
|
d4953dd029
|
[CI skip] Added more Unit Tests
|
2020-08-17 13:00:22 +02:00 |
|
TheBusyBiscuit
|
0d27a787ab
|
Added a new config option for setting Players on fire when radioactive
|
2020-08-17 02:23:59 +02:00 |
|
TheBusyBiscuit
|
1bba2efa3e
|
[CI skip] Added more unit tests
|
2020-08-17 02:23:28 +02:00 |
|
TheBusyBiscuit
|
7a31c88ce9
|
Fixes #2207
|
2020-08-17 00:32:18 +02:00 |
|
TheBusyBiscuit
|
c98fe74ea9
|
Merge branch 'master' into NitwitRune
|
2020-08-17 00:25:18 +02:00 |
|
dniym
|
42e4b1620d
|
Update SlimefunItemSetup.java
Fixed merge conflict 2
|
2020-08-16 13:52:09 -04:00 |
|