Commit Graph

1454 Commits

Author SHA1 Message Date
mryoung
78e7d460d6 Merge branch 'master' into add/quakelive 2020-12-15 10:21:53 +01:00
microton79
2dd5645f0f
Merge pull request #6 from parkervcp/master
Update Master
2020-12-15 10:20:07 +01:00
mryoung
87a926334c Merge branch 'master' into add/quakelive 2020-12-15 10:17:07 +01:00
Michael (Parker) Parker
175755a561
Merge pull request #865 from Software-Noob/patch/minio
patch/minio
2020-12-13 22:49:44 -05:00
Softwarenoob
a0d3b07f49 Fetch from master repo 2020-12-14 05:30:14 +02:00
Michael (Parker) Parker
fcff3a7e44
Merge pull request #864 from Software-Noob/add/barotrauma
Add/barotrauma
2020-12-13 21:38:04 -05:00
Michael (Parker) Parker
34e09b7036
Merge branch 'master' into add/barotrauma 2020-12-13 21:37:44 -05:00
Michael (Parker) Parker
d910b22259
Merge pull request #863 from Software-Noob/add/assetto_corsa
Add/assetto corsa
2020-12-13 21:35:27 -05:00
Michael (Parker) Parker
b241d7c9b3
Merge pull request #852 from acl1704/updates/mohist
Update Mohist for 1.16.4
2020-12-13 21:32:07 -05:00
Michael (Parker) Parker
b1063f85d2
Merge pull request #862 from Software-Noob/add/the_forest
Add The Forest
2020-12-13 21:31:49 -05:00
Alex
14f0c7e8b8
serversettings.xml warning 2020-12-14 04:27:16 +02:00
Alex
c583f4b2fe reduce excess if block 2020-12-13 18:26:28 -08:00
Softwarenoob
51e17b3ec9 add barotrauma 2020-12-14 04:19:31 +02:00
Alex
a3bebea8eb
edit main readme list 2020-12-14 03:50:36 +02:00
Softwarenoob
c1c73cd002 add assetto_corsa to readme files 2020-12-14 03:47:09 +02:00
Softwarenoob
6900e1f4ac Add assetto_corsa 2020-12-14 03:43:32 +02:00
Softwarenoob
448b8c750e fix readme files 2020-12-14 01:19:23 +02:00
Softwarenoob
e7a6007c1b add the_forest to readme files 2020-12-14 01:16:13 +02:00
Softwarenoob
359cc6c35d added the_forest egg 2020-12-14 01:07:25 +02:00
Michael (Parker) Parker
16c1b9bf0e
Merge pull request #860 from Software-Noob/update/ftb
restructure outdated ftb eggs
2020-12-13 16:38:52 -05:00
Alex
d248cd83a3
update text 2020-12-13 23:02:25 +02:00
Alex
009db6c2fb
Include FTB instructions 2020-12-13 23:01:00 +02:00
Alex
28d935aa0b
remove outdated ftb eggs 2020-12-13 22:59:53 +02:00
Softwarenoob
ab5467ab38 restructure ftb 2020-12-13 22:56:31 +02:00
Michael (Parker) Parker
e3010a1865
Merge pull request #837 from gOOvER/teaspeak-beta
Update TeaSpeak Egg to be able to install latest Beta
2020-12-13 11:07:02 -05:00
Torsten Widmann
e5577c7ce4 rename beta to nightly 2020-12-13 17:00:49 +01:00
Michael (Parker) Parker
436efe4b67
Merge pull request #805 from DiscoverSquishy/update/velocity
Updated Compatibility with Velocity 1.x.x
2020-12-13 10:45:33 -05:00
Michael (Parker) Parker
27f04624e3
Merge pull request #814 from tmunsch/minio
add Minio S3 egg
2020-12-13 10:41:25 -05:00
Michael (Parker) Parker
03683ae532
Merge branch 'master' into minio 2020-12-13 10:41:14 -05:00
Michael (Parker) Parker
0e30b35ebb
Merge pull request #853 from tmunsch/patch-5
Update Curse Readme to reference working Modpack
2020-12-13 10:21:55 -05:00
Michael (Parker) Parker
2e4554a1df
Merge pull request #857 from parkervcp/add/gomint
add gomint
2020-12-13 10:19:50 -05:00
Michael (Parker) Parker
86f5d36639
Merge pull request #858 from parkervcp/update/feather
update feather agg
2020-12-13 10:16:32 -05:00
parkervcp
c582e50283
update feather toml to latest 2020-12-13 10:12:52 -05:00
Michael Parker
031e94f5a7
update feather agg 2020-12-12 11:30:05 -05:00
Michael Parker
591086565e
add gomint
resolves #827
2020-12-12 11:16:01 -05:00
Michael (Parker) Parker
90cc5fbb19
Merge pull request #856 from parkervcp/prep/gomint
prep for gomint
2020-12-12 10:12:17 -05:00
Michael Parker
f7860bf999
prep for gomint 2020-12-12 10:11:09 -05:00
Michael (Parker) Parker
192ee814e7
Merge pull request #854 from acl1704/update/cuberite
Fix Cuberite unpack
2020-12-08 20:26:59 -05:00
Alex
796f27d94a fix startup 2020-12-08 17:25:57 -08:00
Alex
08e2b6db97 fix unpacking 2020-12-08 15:11:14 -08:00
tmunsch
d63f8ecfb7
Update Curse Readme to reference Valid Modpack
Updated Readme to include the Modpack that is referenced by default in the Curse Forge egg.
2020-12-08 17:31:58 -05:00
Alex
c3ec1c1a7c update mohist for new instllation process 2020-12-08 13:48:21 -08:00
Michael (Parker) Parker
84308ab716
Merge pull request #849 from tmunsch/patch-3
Update curseforge to reference a working modpack
2020-12-08 12:10:54 -05:00
Michael (Parker) Parker
21e7b7acb8
Merge pull request #848 from acl1704/update/mc
Update MC eggs
2020-12-08 12:10:25 -05:00
tmunsch
294494d952
Update curseforge to reference a working modpack
Update wording to reference a modpack that works out the box as opposed to sevtech ages which doesn't work. I added my BOFA mods modpack however we can use any modpack that works out the box. If used, I vow to not break this modpack and will leave it in it's current state to guarantee it will work when people use it as a test.
2020-12-07 11:36:10 -05:00
Alex
53063f742b update fabric to java 11 2020-12-06 19:55:39 -08:00
Alex
f9719d76f9 Add EULA feature flag
add flag and rename forge version
2020-12-06 19:32:15 -08:00
Michael (Parker) Parker
c01d8282a5
Merge pull request #847 from DomiiBunn/master
Add LeagueSandbox Attempt 2
2020-12-06 16:26:58 -05:00
Dominika Jadowska
b5668289f5
Add League Sandbox Egg 2020-12-06 21:47:57 +01:00
Michael (Parker) Parker
1337934fc0
Merge pull request #846 from tmunsch/patch-2
Update fabric version defaults
2020-12-06 11:49:46 -05:00