diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-04-08 16:50:55 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-04-08 16:50:55 -0300 |
| commit | 5bc68bb32c4f39f6c49cea056fe83fb4e8550448 (patch) | |
| tree | a8e20ce91b21cc76fdfa8e779d1b01523be1d047 | |
| parent | 1a3098ab643df312645b8769344645e563bd140e (diff) | |
| parent | 0e353fea5c8f81496ec733ee05e6fee5d78c70da (diff) | |
| download | serverdata-jesusalva/swamplings.tar.gz serverdata-jesusalva/swamplings.tar.bz2 serverdata-jesusalva/swamplings.tar.xz serverdata-jesusalva/swamplings.zip | |
Merge branch 'master' into jesusalva/swamplingsjesusalva/swamplings
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | db/re/mob_db.conf | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 818f3226..04aaf865 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,7 +259,8 @@ mariadb_run_latest_gcc6: when: always expire_in: 3 week -mariadb_run_latest_gcc7: +# disable gcc-7 for now (dropped by Debian Unstable) +.mariadb_run_latest_gcc7: stage: test script: - export CC=gcc-7 diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index bcac0791..3b36b838 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -2889,7 +2889,6 @@ mob_db: ( AttackMotion: 1 DamageMotion: 1 Drops: { - CrudeDiamond: 45 CrudeAmethyst: 23 CrudeSapphire: 15 |