1117 Commits

This Branch

This Branch

All Branches

• Merge pull request #658 from HypeLevels/patch-1

  Fixed txAdmin typo

  Michael (Parker) Parker · 2020-08-19 13:12:58 -04:00
  d36314d5bf
• Typo
  HypeLevels · 2020-08-19 18:11:32 +01:00
  1dd24a389d
• Merge pull request #655 from parkervcp/remove/rocketmod_modern

  remove rocketmod

  Michael (Parker) Parker · 2020-08-16 20:03:46 -04:00
  98d52baa2f
• remove rocketmod

  This will remove rocketmod as it's causing more problems than it's work to fix as rocketmod is now part of the core Unturned release.

  parkervcp · 2020-08-16 20:03:14 -04:00
  7e0240e012
• Merge pull request #652 from parkervcp/update/killing_floor_2

  update killing floor 2

  Michael (Parker) Parker · 2020-08-14 22:58:21 -04:00
  7c56d5accb
• update killing floor 2
  Michael Parker · 2020-08-14 22:56:30 -04:00
  ae222ca8e4
• Merge pull request #193 from chasx003/master

  add KillingFloor 2 egg

  Michael (Parker) Parker · 2020-08-14 22:52:02 -04:00
  03d22e2f71
• Merge branch 'master' into master
  Michael (Parker) Parker · 2020-08-14 22:50:46 -04:00
  a0a54b36c6
• Merge pull request #575 from dexslab/update/altv

  Change image for alt:V to allow csharp module to work and keep descri…

  Michael (Parker) Parker · 2020-08-13 21:27:04 -04:00
  934406f3ca
• Merge pull request #646 from parkervcp/update/curseforge

  update curseforge generic

  Michael (Parker) Parker · 2020-08-13 20:56:20 -04:00
  447daa914b
• Merge pull request #645 from parkervcp/add/travertine

  add travertine proxy server.

  Michael (Parker) Parker · 2020-08-12 10:10:31 -04:00
  d3715de718
• update curseforge generic

  Deals with another edge case for the Valhelsia series
  
  resolves #642

  Michael Parker · 2020-08-12 08:27:12 -04:00
  a70145dc3d
• Merge pull request #605 from Exonical/upstream/update/conan-exies

  Update Conan Exiles

  Michael (Parker) Parker · 2020-08-12 07:46:35 -04:00
  6b5e0e4291
• update generic readmes too
  Michael Parker · 2020-08-11 15:32:17 -04:00
  d0a3e6631a
• add travertine proxy server.

  Resolves #644
  
  Adds readme for waterfall too.
  
  Basically a find/replace for waterfall.

  Michael Parker · 2020-08-11 15:30:01 -04:00
  9de38fbbdd
• Merge pull request #617 from RuneMasterGaming/add-FTB-modpacks.ch-egg

  Added FTB-modpacks.ch egg

  Michael (Parker) Parker · 2020-08-11 15:17:15 -04:00
  8d530a027d
• Merge pull request #643 from vntxx/patch-1

  Fixed Mindustry typo

  Michael (Parker) Parker · 2020-08-07 22:33:09 -04:00
  5a01397552
• Fixed Mindustry typo

  :]

  Fabian Gabriel · 2020-08-08 03:58:29 +02:00
  ad2d4e1eb6
• Merge pull request #641 from parkervcp/update/stationeers

  Enable automatic updates for Stationeers

  iamkubi · 2020-08-04 20:14:50 -07:00
  4f6d6952d5
• Enable automatic updates for Stationeers
  Ryan Kubiak · 2020-08-04 20:03:55 -07:00
  f0697717cb
• Merge pull request #640 from Pishangfy/patch-3

  update download link (config.yml) for waterfall and update readme.md links

  Michael (Parker) Parker · 2020-08-03 23:25:57 -04:00
  c891868e9f
• Update README.MD

  Update repository URL

  Pishangfy · 2020-08-04 09:51:39 +08:00
  aa6437291e
• Update Waterfall
  Pishangfy · 2020-08-04 09:35:50 +08:00
  7f386ea32f
• Merge pull request #636 from parkervcp/update/discordpy

  nullable variables

  Michael (Parker) Parker · 2020-08-02 15:42:49 -04:00
  a2da99ba38
• nullable variables

  makes other variable nullable

  parkervcp · 2020-08-02 15:41:16 -04:00
  62f860c112
• Merge pull request #635 from parkervcp/updat/discordpy

  fix variable rules

  Michael (Parker) Parker · 2020-08-02 14:27:35 -04:00
  fd2f3cbd4d
• fix variable rules

  makes install repo nullable.

  parkervcp · 2020-08-02 14:26:40 -04:00
  4adbd414a5
• Merge pull request #634 from Pishangfy/patch-2

  Update Paper (server.properties URL)

  Michael (Parker) Parker · 2020-08-02 12:51:49 -04:00
  eb1821c838
• Update Paper
  Pishangfy · 2020-08-03 00:42:46 +08:00
  8791e65063
• Merge pull request #633 from Pishangfy/patch-2

  Update server.properties URL

  Michael (Parker) Parker · 2020-08-02 12:34:52 -04:00
  23a2361ecc
• Update server.properties download URL
  Pishangfy · 2020-08-03 00:23:55 +08:00
  2512715f21
• fix nukkit config download links

  This fixes the nukkit config links

  Michael Parker · 2020-07-29 15:52:22 -04:00
  a8ab1b502d
• Merge pull request #626 from ListinO/patch-2

  Fixing the docker-image

  Michael (Parker) Parker · 2020-07-26 20:43:29 -04:00
  08ab92c018
• Change to the creator email
  ListinO · 2020-07-27 01:43:37 +02:00
  a7d41046c6
• Merge pull request #629 from parkervcp/update/velocity

  fix velocity proxy config location

  Michael (Parker) Parker · 2020-07-26 19:27:20 -04:00
  a119449fa6
• fix velocity proxy config location

  resolves #628

  Michael Parker · 2020-07-24 20:45:46 -04:00
  34eed2c0a5
• Merge pull request #627 from parkervcp/update/discordjs

  adding a space to start command

  Michael (Parker) Parker · 2020-07-23 16:19:56 -04:00
  ccfc244908
• adding a space to start command
  parkervcp · 2020-07-23 16:18:54 -04:00
  c012c04367
• Fixing the docker-image

  Fix the bad url used for the image

  ListinO · 2020-07-22 18:16:25 +02:00
  28140e9f57
• Merge pull request #625 from parkervcp/update/discord_generic

  update node_packages variable

  Michael (Parker) Parker · 2020-07-18 23:16:45 -04:00
  0568c95170
• update node_packages variable

  make the variable nullable

  Michael Parker · 2020-07-18 23:16:13 -04:00
  413e764391
• Merge pull request #624 from parkervcp/update/python_generic

  change install location

  Michael (Parker) Parker · 2020-07-18 21:03:33 -04:00
  3f4de6038f
• change install location
  Michael Parker · 2020-07-18 21:00:46 -04:00
  27135b8d3f
• Merge pull request #603 from parkervcp/update/ark

  add flag to disable BattleEye for ARK

  Michael (Parker) Parker · 2020-07-17 09:54:57 -04:00
  ff80c05047
• fix so it only shows up when disabled.
  Michael Parker · 2020-07-17 09:54:15 -04:00
  9cb254b286
• Merge pull request #618 from camjac251/patch-1

  small grammar fix

  Michael (Parker) Parker · 2020-07-17 09:51:56 -04:00
  d009f90df6
• small grammart fix

  grammar fix

  camjac251 · 2020-07-16 00:09:21 -05:00
  b5a83024fa
• Added FTB-modpacks.ch egg

  Added an egg to pull newer FTB packs from modpacks.ch.

  Rune · 2020-07-15 19:02:24 -04:00
  83139adb6f
• Merge pull request #604 from parkervcp/add/redis-6

  Add/redis 6

  Michael (Parker) Parker · 2020-07-14 23:13:53 -04:00
  b8f18c411c
• Merge branch 'master' into add/redis-6
  Michael (Parker) Parker · 2020-07-14 23:13:45 -04:00
  c4ea3fe01b