TheBusyBiscuit
|
28dda7caea
|
Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469
Fixes ArmorForge
|
2020-10-28 12:15:34 +01:00 |
|
TheBusyBiscuit
|
6ad3b55e81
|
Merge pull request #2510 from Mooy1/Fix
Fixes #2509
|
2020-10-28 12:14:52 +01:00 |
|
TheBusyBiscuit
|
d90699ee7d
|
[CI skip] Updated changelog
|
2020-10-28 12:14:31 +01:00 |
|
TheBusyBiscuit
|
232ee74ceb
|
Fixed contributors menu not showing everyone
|
2020-10-28 01:01:25 +01:00 |
|
TheBusyBiscuit
|
b3befbda49
|
Some code cleanup, documentation and paper optimizations
|
2020-10-28 00:44:35 +01:00 |
|
TheBusyBiscuit
|
acecbff990
|
[CI skip] Merge pull request #2514 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.150
|
2020-10-28 00:00:56 +01:00 |
|
Renovate Bot
|
af584ffd48
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.150
|
2020-10-27 20:26:51 +00:00 |
|
Mooy1
|
d8d98982b2
|
Update AContainer.java
|
2020-10-27 09:13:25 -05:00 |
|
TheBusyBiscuit
|
be64670cca
|
[CI skip] Merge pull request #2512 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.6.0
|
2020-10-27 14:48:24 +01:00 |
|
Renovate Bot
|
c8ad6b1ae7
|
Update dependency org.mockito:mockito-core to v3.6.0
|
2020-10-27 03:16:54 +00:00 |
|
Mooy1
|
7c39dbc3af
|
this gud idk
|
2020-10-26 09:09:22 -05:00 |
|
Mooy1
|
9f88f24d40
|
Update src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2020-10-26 08:51:20 -05:00 |
|
Mooy1
|
8608b9223d
|
Fixes
|
2020-10-25 22:52:27 -05:00 |
|
Sfiguz7
|
386a9b6b95
|
Smallest documentation fix ever
|
2020-10-25 19:00:30 +01:00 |
|
TheBusyBiscuit
|
c213a146af
|
[CI skip] Merge pull request #2506 from Slimefun/gitlocalize-13929
Updated Hungarian translations
|
2020-10-25 15:45:28 +01:00 |
|
poma123
|
99946174de
|
Translate researches_hu.yml via GitLocalize
|
2020-10-25 14:40:55 +00:00 |
|
poma123
|
f5751561a5
|
Translate messages_hu.yml via GitLocalize
|
2020-10-25 14:40:54 +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 |
|
TheBusyBiscuit
|
174bd8b4d8
|
Merge pull request #2501 from Seggan/master
Changed some things to public (from protected)
|
2020-10-25 11:15:58 +01:00 |
|
TheBusyBiscuit
|
e9ad3ee357
|
Finished Cargo Filter implementation
|
2020-10-25 02:47:25 +02: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 |
|
TheBusyBiscuit
|
ff7de9c461
|
[CI skip] Merge pull request #2498 from Slimefun/renovate/ibiqlik-action-yamllint-2.x
Update ibiqlik/action-yamllint action to v2
|
2020-10-23 12:39:30 +02:00 |
|
TheBusyBiscuit
|
0b4bf78450
|
oops
|
2020-10-23 12:23:56 +02:00 |
|
TheBusyBiscuit
|
ef19b566e5
|
[CI skip] Updated yaml linter config
|
2020-10-23 12:22:42 +02:00 |
|
CURVX
|
f5af271445
|
Little refractoring, changes req. by TTB
|
2020-10-22 23:58:54 +05:30 |
|
uiytt
|
95a2dc08d4
|
Formatting fix
|
2020-10-22 16:06:11 +02:00 |
|
Renovate Bot
|
ea6f634fd1
|
Update ibiqlik/action-yamllint action to v2
|
2020-10-22 10:38:46 +00:00 |
|
svr333
|
03edaa53a3
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-21 22:29:18 +02:00 |
|
svr333
|
6a250d6d00
|
Fix requested changes
|
2020-10-21 22:28:59 +02:00 |
|
Moritz Kempe
|
d15be35e0b
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
|
2020-10-21 08:12:41 +02:00 |
|
CURVX
|
4f762b37b6
|
Fixes#2447
|
2020-10-20 22:48:53 +05:30 |
|
TheBusyBiscuit
|
38bf228012
|
Merge pull request #2490 from Mooy1/patch-1
fix empty slot in contributors
|
2020-10-20 17:43:09 +02:00 |
|
TheBusyBiscuit
|
cf283c24ab
|
[CI skip] Updated changelog
|
2020-10-20 17:42:57 +02:00 |
|
TheBusyBiscuit
|
7495b63ea8
|
[CI skip] Merge pull request #2491 from Slimefun/renovate/technote-space-toc-generator-2.x
Update technote-space/toc-generator action to v2.5.1
|
2020-10-20 17:42:21 +02:00 |
|
TheBusyBiscuit
|
4c86da2602
|
[CI skip] Merge pull request #2492 from Slimefun/renovate/actions-checkout-2.x
Update actions/checkout action to v2
|
2020-10-20 17:42:04 +02:00 |
|
Mooy1
|
43a1d6cc8a
|
Merge branch 'patch-1' of https://github.com/Mooy1/Slimefun4 into patch-1
|
2020-10-20 10:34:47 -05:00 |
|
Mooy1
|
536c5af857
|
Update ContributorsMenu.java
|
2020-10-20 10:34:35 -05:00 |
|
Mooy1
|
fcb1ad09bf
|
Update ContributorsMenu.java
|
2020-10-20 10:32:54 -05:00 |
|
TheBusyBiscuit
|
094d4a6ae0
|
Fixes #2493
|
2020-10-20 16:45:31 +02:00 |
|
TheBusyBiscuit
|
48f8311a20
|
[CI skip] Updated changelog
|
2020-10-20 16:45:26 +02:00 |
|
Renovate Bot
|
a71b2835ac
|
Update actions/checkout action to v2
|
2020-10-20 14:23:46 +00:00 |
|