scryfall: parse mtga deck format

[factor.git] / README.md

diff --git a/README.md b/README.md
index 06d0491c9daf0063fc087e69bab1abf399c34701..4d43adb7b304e3fcb386507b5461fbd826bd12af 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
 # Factor
 
+![Build](https://github.com/factor/factor/actions/workflows/build.yml/badge.svg)
+
 Factor is a [concatenative](https://www.concatenative.org), stack-based
 programming language with [high-level
 features](https://concatenative.org/wiki/view/Factor/Features/The%20language)
 including dynamic types, extensible syntax, macros, and garbage collection.
 On a practical side, Factor has a [full-featured
 library](https://docs.factorcode.org/content/article-vocab-index.html),
-supports many different platforms, and has been extensively documented. 
+supports many different platforms, and has been extensively documented.
 
 The implementation is [fully
 compiled](https://concatenative.org/wiki/view/Factor/Optimizing%20compiler)
@@ -28,16 +30,29 @@ a boot image stored on factorcode.org.
 
 To check out Factor:
 
-* `git clone git://factorcode.org/git/factor.git`
+* git clone https://github.com/factor/factor.git
 * `cd factor`
 
-To build the latest complete Factor system from git:
+To build the latest complete Factor system from git, either use the
+build script:
+
+* Unix: `./build.sh update`
+* Windows: `build.cmd`
+* M1 macOS: `arch -x86_64 ./build.sh update`
+
+or download the correct boot image for your system from
+https://downloads.factorcode.org/images/master/, put it in the `factor`
+directory and run:
 
-* Windows: `build-support\factor.cmd`
-* Unix: `./build-support/factor.sh update`
+* Unix: `make` and then `./factor -i=boot.unix-x86.64.image`
+* Windows: `nmake /f Nmakefile x86-64` and then `factor.com -i=boot.windows-x86.64.image`
 
 Now you should have a complete Factor system ready to run.
 
+Factor does not yet work on arm64 cpus. There is an arm64 assembler
+in `cpu.arm.64.assembler` and we are working on a port and also looking for
+contributors.
+
 More information on [building factor](https://concatenative.org/wiki/view/Factor/Building%20Factor)
 and [system requirements](https://concatenative.org/wiki/view/Factor/Requirements).
 
@@ -52,12 +67,26 @@ The nightly builds are usually a better experience than the point releases.
 
 ### Learning Factor
 
-A tutorial is available that can be accessed from the Factor environment:
+A [tutorial](https://docs.factorcode.org/content/article-first-program.html)
+is available that can be accessed from the Factor environment:
 
 ```factor
 "first-program" help
 ```
 
+Take a look at a [guided
+tour](https://docs.factorcode.org/content/article-tour.html) of Factor:
+
+```factor
+"tour" help
+```
+
+Some demos that are included in the distribution to show off various features:
+
+```factor
+"demos" run
+```
+
 Some other simple things you can try in the listener:
 
 ```factor
@@ -65,9 +94,9 @@ Some other simple things you can try in the listener:
 
 { 4 8 15 16 23 42 } [ 2 * ] map .
 
-1000 [1,b] sum .
+1000 [1..b] sum .
 
-4 iota  [
+4 <iota> [
     "Happy Birthday " write
     2 = "dear NAME" "to You" ? print
 ] each
@@ -112,21 +141,40 @@ You can also write scripts that can be run from the terminal, by putting
 
 The Factor source tree is organized as follows:
 
-* `build-support/` - scripts used for compiling Factor (not present in binary packages)
 * `vm/` - Factor VM source code (not present in binary packages)
 * `core/` - Factor core library
 * `basis/` - Factor basis library, compiler, tools
 * `extra/` - more libraries and applications
 * `misc/` - editor modes, icons, etc
-* `unmaintained/` - unmaintained contributions, please help!
+* `unmaintained/` - now at [factor-unmaintained](https://github.com/factor/factor-unmaintained)
+
+## Source History
+
+During Factor's lifetime, source code has lived in many repositories. Unfortunately, the first import in Git did not keep history. History has been partially recreated from what could be salvaged. Due to the nature of Git, it's only possible to add history without disturbing upstream work, by using replace objects. These need to be manually fetched, or need to be explicitly added to your git remote configuration.
+
+Use:
+`git fetch origin 'refs/replace/*:refs/replace/*'`
+
+or add the following line to your configuration file
+
+```
+[remote "origin"]
+    url = ...
+    fetch = +refs/heads/*:refs/remotes/origin/*
+    ...
+    fetch = +refs/replace/*:refs/replace/*
+```
+
+Then subsequent fetches will automatically update any replace objects.
 
 ## Community
 
-Factor developers meet in the `#concatenative` channel on
-[irc.freenode.net](http://freenode.net). Drop by if you want to discuss
-anything related to Factor or language design in general.
+Factor developers are quite active in [the Factor Discord server](https://discord.gg/QxJYZx3QDf).
+Drop by if you want to discuss anything related to Factor or language design in general.
 
 * [Factor homepage](https://factorcode.org)
 * [Concatenative languages wiki](https://concatenative.org)
+* [Join the mailing list](https://concatenative.org/wiki/view/Factor/Mailing%20list)
+* Search for "factorcode" on [Gitter](https://gitter.im/)
 
 Have fun!