TheBusyBiscuit
|
816c0a4e49
|
Updated headings
|
2020-10-07 17:23:44 +02:00 |
|
TheBusyBiscuit
|
bbb2a78a4c
|
Added some code-style guidelines to CONTRIBUTING
|
2020-10-07 17:16:33 +02:00 |
|
LinoxGH
|
eb572a1a77
|
Merge branch 'master' into EnergyConnector
|
2020-10-07 18:10:50 +03:00 |
|
svr333
|
d17d21b7ed
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-07 17:04:31 +02:00 |
|
svr333
|
a6a29509c7
|
Fix remaining issues
|
2020-10-07 17:02:42 +02:00 |
|
TheBusyBiscuit
|
273d95ed9c
|
Delete settings.json
|
2020-10-07 16:51:52 +02:00 |
|
svr333
|
5e39920e59
|
Remove static's
|
2020-10-07 16:45:34 +02:00 |
|
svr333
|
9be590459a
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-07 16:43:20 +02:00 |
|
svr333
|
79d652bb70
|
Add .factorypath and .vscode folder
|
2020-10-07 16:42:53 +02:00 |
|
TheBusyBiscuit
|
78515a3c61
|
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw
Add sticks recipe to table saw
|
2020-10-07 16:31:58 +02:00 |
|
TheBusyBiscuit
|
354cb201c5
|
[CI skip] Updated changelog
|
2020-10-07 16:31:33 +02:00 |
|
TheBusyBiscuit
|
20a9c642fe
|
Some code cleanup
|
2020-10-07 16:24:14 +02: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
|
a5998773e3
|
Fix build error
|
2020-10-07 16:04:02 +02:00 |
|
TheBusyBiscuit
|
80c4242dd7
|
Merge pull request #2384 from Seggan/master
Added Elytra Cap
|
2020-10-07 16:01:45 +02:00 |
|
TheBusyBiscuit
|
7b179239e4
|
[CI skip] Updated changelog
|
2020-10-07 16:01:19 +02:00 |
|
svr333
|
3747ba4afa
|
Remove second consumeItem
|
2020-10-07 15:59:33 +02:00 |
|
svr333
|
a9b8f608ff
|
Attempt to make it work
|
2020-10-07 15:54:32 +02:00 |
|
TheBusyBiscuit
|
942cb8e1e1
|
Merge pull request #2404 from Sfiguz7/master
Fixes #2403
|
2020-10-07 14:30:10 +02:00 |
|
TheBusyBiscuit
|
c33f73d2fe
|
[CI skip] Updated changelog
|
2020-10-07 14:30:01 +02:00 |
|
Sfiguz7
|
91a7d9eacd
|
Why u do dis IntelliJ >:(
|
2020-10-07 13:37:32 +02:00 |
|
Sfiguz7
|
46dca73e04
|
Forgot to clean crucible changes off
|
2020-10-07 13:36:11 +02:00 |
|
Sfiguz7
|
f8be447821
|
Fixes #2403
|
2020-10-07 13:32:10 +02:00 |
|
Sfiguz7
|
51d0ac0417
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-10-07 13:06:45 +02:00 |
|
svr333
|
85091516db
|
Add generic fail message
|
2020-10-07 12:12:02 +02:00 |
|
svr333
|
8ff3b31bf6
|
Create tryFind method
|
2020-10-07 12:03:45 +02:00 |
|
NCBPFluffyBear
|
37f0715156
|
Added permission checks for the GEO Scanner and GPS Control Panel
|
2020-10-06 19:46:22 -05:00 |
|
svr333
|
db7e39ff10
|
Fix requested changes
|
2020-10-07 00:06:32 +02:00 |
|
svr333
|
2eddaef88c
|
Fix comments
|
2020-10-07 00:00:22 +02:00 |
|
Seggan
|
1ccd4c14ac
|
More changes...
|
2020-10-06 15:41:14 -04:00 |
|
Seggan
|
960d53840a
|
Moved import
|
2020-10-06 15:39:15 -04:00 |
|
Seggan
|
20aa5d49dc
|
Merged ifs
|
2020-10-06 15:34:37 -04:00 |
|
Seggan
|
d1ede58f85
|
More requested changes...
|
2020-10-06 15:12:35 -04:00 |
|
TheBusyBiscuit
|
47590ac972
|
Merge branch 'master' into tags
|
2020-10-06 21:07:49 +02:00 |
|
TheBusyBiscuit
|
d09a7e0f93
|
Fixes #2391
|
2020-10-06 21:05:39 +02:00 |
|
TheBusyBiscuit
|
07c84af3b5
|
Added NotConfigurable attribute
|
2020-10-06 21:01:18 +02:00 |
|
TheBusyBiscuit
|
f98d048b55
|
[CI skip] Reduced technical debt
|
2020-10-06 20:20:02 +02:00 |
|
svr333
|
fa394b4d44
|
Call planks.isPresent()
|
2020-10-06 19:50:57 +02:00 |
|
svr333
|
a9ce3c1f3e
|
Try to implement requested feature for RessurectedTalisman
|
2020-10-06 15:34:18 +02:00 |
|
svr333
|
e6ed632dd0
|
Refactor + undo placeholder item in displayrecipes
|
2020-10-06 11:53:51 +02:00 |
|
svr333
|
37242fe64a
|
Throw out variables
|
2020-10-06 01:26:23 +02:00 |
|
Seggan
|
db6295616e
|
Did more requested changes
|
2020-10-05 17:05:05 -04:00 |
|
Seggan
|
a4dc1428bc
|
Changed protection check (untested)
|
2020-10-05 17:02:09 -04:00 |
|
svr333
|
8c44c583cf
|
Add nullable tag
|
2020-10-05 23:01:30 +02:00 |
|
svr333
|
6e17cd2cc5
|
Extract to method
|
2020-10-05 23:00:44 +02:00 |
|
Seggan
|
4b3e31a8c7
|
Renamed listener
|
2020-10-05 16:56:25 -04:00 |
|
TheBusyBiscuit
|
cdff86fdd6
|
Merge pull request #2394 from svr333/ImproveMagicalZombiePills
Improve magical zombie pills
|
2020-10-05 22:50:47 +02:00 |
|
TheBusyBiscuit
|
b26924bf81
|
[CI skip] Updated changelog
|
2020-10-05 22:50:32 +02:00 |
|
svr333
|
d5caaaa13e
|
Add base for ResurrectedTalisman
|
2020-10-05 22:46:53 +02:00 |
|