Merge branch 'develop' into 'master'

2.4.3 See merge request Dandellion/matrix-wug!17
2020-07-19 19:34:18 +00:00 · 2020-07-16 17:31:46 +00:00 · 2019-06-24 23:58:33 +00:00 · 2019-03-15 13:12:14 +00:00 · 2019-03-14 23:01:09 +00:00 · 2019-03-07 00:54:01 +00:00
6 changed files with 1226 additions and 1175 deletions
--- a/index.ts
+++ b/index.ts
@ -1,4 +1,4 @@
-const version = "2.4.4";
+const version = "2.4.3";
 import x2i from "./x2i";
 import { existsSync } from "fs";

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,15 +1,14 @@
 {
-  "name": "matrix-wug",
-  "version": "2.4.3",
+  "name": "vugg",
+  "version": "1.1.0",
  "description": "Language bot for matrix",
  "main": "index.js",
-  "bin": "build/index.js",
  "scripts": {
    "build": "tsc",
    "start": "node build/index.js"
  },
  "author": "Daniel",
-  "license": "AGPL3",
+  "license": "ISC",
  "dependencies": {
    "matrix-bot-sdk": "^0.3.2",
    "@types/js-yaml": "^3.12.1",
--- a/shell.nix
+++ b/shell.nix
@ -1,7 +1,7 @@
 with import <nixpkgs> {};
 stdenv.mkDerivation {
  name = "node";
-  buildInputs = [ nodejs-10_x yarn ];
+  buildInputs = [ nodejs-10_x ];
  shellHook = ''
    export PATH="$PWD/node_modules/.bin/:$PATH"
  '';
--- a/x2i/dictionaries/hi-keys.yaml
+++ b/x2i/dictionaries/hi-keys.yaml
@ -20,9 +20,6 @@
 - raw:
  - "[ōô]"
  - "oo"
- raw:
-  - "[īî]"
-  - "ii"

 # youon souken 5-letter
 - raw:
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Daniel Løvbrøtte Olsen	e18e3627f4	Merge branch 'develop' into 'master' 2.4.3 See merge request Dandellion/matrix-wug!17	2020-07-19 19:34:18 +00:00
Daniel Løvbrøtte Olsen	dfbe938b68	Merge branch 'develop' into 'master' Small maintainance update See merge request Dandellion/matrix-wug!15	2020-07-16 17:31:46 +00:00
Daniel Løvbrøtte Olsen	f27347d6ec	Merge branch 'develop' into 'master' Develop See merge request Dandellion/matrix-wug!14	2019-06-24 23:58:33 +00:00
Daniel Løvbrøtte Olsen	6ac0b87e0d	Merge branch 'develop' into 'master' 2.3 See merge request Dandellion/matrix-wug!13	2019-03-15 13:12:14 +00:00
Daniel Løvbrøtte Olsen	3268701820	Merge branch 'develop' into 'master' 2.2.1 See merge request Dandellion/matrix-wug!12	2019-03-14 23:01:09 +00:00
Daniel Løvbrøtte Olsen	b511388ae8	Merge branch 'develop' into 'master' Add ability to run arbitrary script on matched text, add cherokee, update help messages and version See merge request Dandellion/matrix-wug!11	2019-03-07 00:54:01 +00:00
Daniel Løvbrøtte Olsen	f82d415b3e	Merge branch 'develop' into 'master' Fix pie help command See merge request Dandellion/matrix-wug!10	2019-03-01 01:54:10 +00:00
Daniel Løvbrøtte Olsen	dc45ff0df3	Merge branch 'develop' into 'master' 2.1.1 See merge request Dandellion/matrix-wug!9	2019-03-01 01:47:00 +00:00