Merge branch 'Putnam3145:master' into master

.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: Linux build
+on:
+  push:
+    branches: [master]
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: i686-unknown-linux-gnu
+          override: true
+
+      - name: Install g++-multilib
+        run: |
+          sudo apt update
+          sudo apt install g++-multilib -y
+      - name: Build auxmos
+        run: cargo build --target=i686-unknown-linux-gnu --release --features "all_reaction_hooks"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Linux compile
+          path: target/i686-unknown-linux-gnu/release/libauxmos.*

.github/workflows/check.yml

@@ -0,0 +1,19 @@
+name: Check compile
+on: pull_request
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: i686-unknown-linux-gnu
+          override: true
+
+      - name: Install g++-multilib
+        run: |
+          sudo apt update
+          sudo apt install g++-multilib -y
+      - name: Check auxmos build
+        run: cargo check --target=i686-unknown-linux-gnu --release --features "all_reaction_hooks monstermos explosive_decompression"

Cargo.toml

@@ -33,10 +33,10 @@ rayon = "1.5.0"
 float-ord = "0.2.0"
 crossbeam = "0.8.0"
 flume = "0.10.5"
-coarsetime = "0.1.16"
 parking_lot = "0.11.1"
 fxhash = "0.2.1"
 nonmax = "0.5.0"
+indexmap = "1.7.0"
 
 [dependencies.dashmap]
 version = "4.0.2"

src/gas.rs

@@ -57,7 +57,7 @@ fn unregister_mix(i: u32) {
 
 #[init(partial)]
 fn _init_gas_mixtures() -> Result<(), String> {
-	*GAS_MIXTURES.write() = Some(Vec::with_capacity(120_000));
+	*GAS_MIXTURES.write() = Some(Vec::with_capacity(240_000));
 	*NEXT_GAS_IDS.write() = Some(Vec::with_capacity(2000));
 	Ok(())
 }