Merge remote-tracking branch 'origin/master' into play_2021

* origin/master:
  Add/Fix sausage requirements (casings, funnels) (CleverRaven#48993)
  Wasp harvest for pupa and larva (CleverRaven#49878)
  Unhardcode monster smash attacks  (CleverRaven#49316)
  Add time elapsed/remaining to effects info panel (CleverRaven#48917)
  Update doc/COMPILING/COMPILER_SUPPORT.md
  Update matrix.yml
  Update woodworking.json
  Suppress unused macro warning
  Remove .travis.yml
  Expand GitHub matrix workflow to more compilers
  Update Travis for new compiler requirements
  Dump compiler version at start of build.sh
  Update compiler support versions
  adjust item::can_contain and item::best_pocket to match their item_contents variants
  wrappers for item_contents::only_item and item_contents::favorite_settings_menu in item
  wrappers for item_contents::overflow and item_contents::empty_container in item
  use item::get_total_capacity instead of item_contents::total_container_capacity
  wrappers for item_contents::insert_cost and item_contents::obtain_cost in item
  wrappers for item_contents::get_contents_volume_with_tweaks and item_contents::get_nested_content_volume_recursive in item
  colorize spells in spellbooks

.github/workflows/matrix.yml

@@ -8,6 +8,26 @@ on:
     branches:
     - master
 
+# Overall strategy for what sorts of builds to include:
+# We want a build for the newest and oldest supported version of each compiler.
+# We want a build for each platform.
+# We also want to ensure that each of the following tweaks are covered in at
+# least one PR build:
+# - TILES=1
+# - SOUND=1
+# - RELEASE=1
+# - CMAKE=1
+# - LOCALIZE=0
+# - LTO=1
+# - Tests with important mods enabled (Magiclysm)
+# - A clang-tidy run
+# - SANITIZE=address,undefined
+# We try to minimize the number of builds subject to those constraints.
+#
+# To see what toolchains are available, the following may be useful:
+# https://launchpad.net/%7Eubuntu-toolchain-r/+archive/ubuntu/test/+index
+# https://apt.llvm.org/
+
 jobs:
   skip-duplicates:
     continue-on-error: true
@@ -26,37 +46,53 @@ jobs:
     if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
     strategy:
       matrix:
+        release: [0]
+        cmake: [0]
+        tiles: [1]
+        localize: [1]
+        native: [linux64]
+
         include:
-          - compiler: g++-7
+          - compiler: g++-11
             os: ubuntu-latest
+            tiles: 0
+            test-stage: 1
+            gold: 1
+            lto: 1
+            title: GCC 11, Ubuntu, Curses, LTO
+
+          - compiler: g++-7
+            os: ubuntu-18.04
             cmake: 1
-            tiles: 1
-            native: linux64
-            title: GCC 7, Ubuntu, Tiles, CMake
+            mods: --mods=magiclysm
+            localize: 0
+            title: GCC 7, Ubuntu, Tiles, CMake, Release
+
           - compiler: g++-8
             os: ubuntu-latest
-            cmake: 0
-            tiles: 1
             sanitize: address
-            native: linux64
-            title: GCC 8, Ubuntu, Tiles, ASan
+            release: 1
+            title: GCC 8, Ubuntu, Tiles, ASan, Release
+
+          - compiler: clang++-6.0
+            os: ubuntu-18.04
+            tiles: 0
+            release: 1
+            title: Clang 6, Ubuntu, Curses, Release
+
           - compiler: clang++-12
             os: ubuntu-latest
-            cmake: 0
-            tiles: 1
             sanitize: address,undefined
-            native: linux64
             title: Clang 12, Ubuntu, Tiles, ASan, UBSan
+
           - compiler: clang++
             os: macos-10.15
-            cmake: 0
-            tiles: 1
             native: osx
             title: Clang 12, macOS 10.15, Tiles
+
           - compiler: g++
             os: ubuntu-latest
-            cmake: 0
-            tiles: 1
+            native:
             title: GCC, Ubuntu cross-compile to MinGW-Win64, Tiles
             ldflags: -static-libgcc -static-libstdc++
             mxe_target: i686-w64-mingw32.static
@@ -71,14 +107,16 @@ jobs:
         OS: ${{ matrix.os }}
         TILES: ${{ matrix.tiles }}
         SOUND: ${{ matrix.tiles }}
+        LOCALIZE: ${{ matrix.localize }}
+        MODS: ${{ matrix.mods }}
         SANITIZE: ${{ matrix.sanitize }}
         TEST_STAGE: ${{ matrix.test-stage }}
         LDFLAGS: ${{ matrix.ldflags }}
         EXTRA_TEST_OPTS: --error-format=github-action
         NATIVE: ${{ matrix.native }}
         GOLD: ${{ matrix.gold }}
         LTO: ${{ matrix.lto }}
-        RELEASE: 1
+        RELEASE: ${{ matrix.release }}
     steps:
     - name: checkout repository
       uses: actions/checkout@v1
@@ -90,10 +128,20 @@ jobs:
           sudo apt-get update
           sudo apt-get install libncursesw5-dev libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev \
             libsdl2-mixer-dev libpulse-dev ccache gettext parallel
-    - name: install old GCC (ubuntu)
+    - name: install old GCC (Ubuntu)
       if: runner.os == 'Linux' && (matrix.compiler == 'g++-7' || matrix.compiler == 'g++-8')
       run: |
           sudo apt-get install g++-7 g++-8
+    - name: install new GCC (Ubuntu)
+      if: runner.os == 'Linux' && (matrix.compiler == 'g++-11')
+      run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get install g++-11
+    - name: install old Clang (Ubuntu)
+      if: runner.os == 'Linux' && (matrix.compiler == 'clang++-6.0')
+      run: |
+          sudo apt-get install clang-6.0
     - name: install dependencies (mac)
       if: runner.os == 'macOS'
       run: |

build-scripts/build.sh

@@ -10,6 +10,8 @@ num_jobs=3
 # We might need binaries installed via pip, so ensure that our personal bin dir is on the PATH
 export PATH=$HOME/.local/bin:$PATH
 
+$COMPILER --version
+
 if [ -n "$TEST_STAGE" ]
 then
     build-scripts/lint-json.sh

data/json/items/tool/woodworking.json

@@ -147,7 +147,7 @@
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "hatchet" },
-    "description": "A one-handed hatchet.  Makes a great melee weapon, and is useful both for chopping things and for use as a hammer.",
+    "description": "A one-handed hatchet.  Makes a great melee weapon until the wooden haft breaks, and is useful both for chopping things and for use as a hammer.",
     "price": 2500,
     "price_postapoc": 500,
     "material": [ "steel", "wood" ],
@@ -158,7 +158,7 @@
     "bashing": 17,
     "cutting": 28,
     "to_hit": -2,
-    "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "flags": [ "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ],
     "category": "weapons",
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ]
   },