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 |
|
dniym
|
45b63a149b
|
Update HeadTexture.java
Resolved Merge Conflict 1
|
2020-08-16 13:45:18 -04:00 |
|
dniym
|
b22bdb55ff
|
Made requested changes
|
2020-08-16 13:33:36 -04:00 |
|
TheBusyBiscuit
|
2a8abcbdbf
|
Fixed unit tests, also improved test coverage
|
2020-08-16 15:57:09 +02:00 |
|
TheBusyBiscuit
|
aaba3ae777
|
[CI skip] Merge pull request #2226 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.0
|
2020-08-16 15:53:59 +02:00 |
|
TheBusyBiscuit
|
4911b8a5b6
|
[CI skip] Added another url to be excluded
|
2020-08-16 15:53:40 +02:00 |
|
TheBusyBiscuit
|
037e8d83df
|
Small performance improvement, also reduced technical debt a bit
|
2020-08-16 15:49:47 +02:00 |
|
Renovate Bot
|
d9d1d0961f
|
Update dependency org.mockito:mockito-core to v3.5.0
|
2020-08-16 00:58:12 +00:00 |
|
TheBusyBiscuit
|
2aa93f7e96
|
[CI skip] Merge pull request #2225 from TheBusyBiscuit/gitlocalize-12641
messges_es
|
2020-08-14 23:55:52 +02:00 |
|
Luu7
|
9a6b8d697d
|
Translate messages_es.yml via GitLocalize
|
2020-08-14 21:53:14 +00:00 |
|
TheBusyBiscuit
|
d5065b8d63
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy
|
2020-08-14 15:44:00 +02:00 |
|
TheBusyBiscuit
|
4aca454422
|
[CI skip] Merge pull request #2222 from TheBusyBiscuit/gitlocalize-12636
Updated german translations
|
2020-08-14 01:52:46 +02:00 |
|
TheBusyBiscuit
|
bae8421511
|
Translate messages_de.yml via GitLocalize
|
2020-08-13 23:51:00 +00:00 |
|
TheBusyBiscuit
|
8b02c18bb4
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-14 01:46:25 +02:00 |
|
TheBusyBiscuit
|
eb5b2678e0
|
Fixes #2077
|
2020-08-14 01:46:05 +02:00 |
|
dniym
|
644878c534
|
Made Requested Changes
|
2020-08-13 16:21:18 -04:00 |
|
TheBusyBiscuit
|
a9d85558a3
|
[CI skip] Merge pull request #2221 from TheBusyBiscuit/gitlocalize-12635
Updated TR localization
|
2020-08-13 21:56:29 +02:00 |
|
LinoxGH
|
18bbef426b
|
Translate recipes_tr.yml via GitLocalize
|
2020-08-13 19:53:14 +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
|
a33cfdb12d
|
added a check for jobless villagers
|
2020-08-12 16:08:15 -04: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 |
|
TheBusyBiscuit
|
923b59c6e7
|
[CI skip] Reduced technical debt
|
2020-08-11 16:28:52 +02:00 |
|
TheBusyBiscuit
|
e406481b98
|
[CI skip] Replaced the last tabs with spaces
|
2020-08-11 16:23:31 +02:00 |
|
TheBusyBiscuit
|
1aaedf0825
|
[CI skip] Added more Unit Tests
|
2020-08-11 11:17:08 +02:00 |
|
TheBusyBiscuit
|
61397c82e9
|
[CI skip] Merge pull request #2216 from TheBusyBiscuit/gitlocalize-12586
Updated messages_zh-CN.yml
|
2020-08-10 12:21:17 +02:00 |
|