Merge remote-tracking branch 'origin/master'

2025-12-13 22:59:02 +00:00 · 2017-12-28 22:39:22 -05:00
parent 0fee35baec 729debb1a3
commit eced45a358
1 changed files with 1 additions and 1 deletions
--- a/Server/src/main/java/net/simon987/server/assembly/CPU.java
+++ b/Server/src/main/java/net/simon987/server/assembly/CPU.java
@@ -44,7 +44,7 @@ public class CPU implements JSONSerialisable {

    /**
     * Offset of the code segment. The code starts to get
-     * executed at this address each tick. Defaults to 0x4000
+     * executed at this address each tick. Defaults to org_offset@config.properties
     */
    private int codeSegmentOffset;