9f72448ecd
Properly deprecate colors.rgb8
2020-08-04 19:50:36 +01:00
cd879b067f
Merge pull request #508 from neumond/mc-1.15.x
...
Fix JSON serialization of strings
2020-07-25 17:51:46 +01:00
053cb1b53c
Fix JSON serialization of strings
...
Control characters become escaped as JSON requires
Non-ASCII characters get escaped as well for better interoperability
We assume here that lua strings represent only first 256 code points of unicode
2020-07-25 19:40:06 +03:00
ac7979fb46
Bump for 1.90.2
2020-07-25 11:53:46 +01:00
2f323f23d7
Update changelog for release
2020-07-18 12:23:36 +01:00
3f277a7a7b
Bump version to 1.90.0
...
Going to let this stew for a couple of days - there's probably something
else which'll break.
2020-07-06 15:38:09 +01:00
8f3a56dd32
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-06-30 11:31:41 +01:00
113d5d982f
Merge branch 'master' into mc-1.14.x
2020-06-30 11:28:56 +01:00
b54519d0e6
Add functions for parsing and drawing nft ( #458 )
2020-06-25 09:08:35 +01:00
9499654757
Add documentation for peripherals
...
No clue how we're going to do this for the dynamic peripheral system
if/when that ships, but this is a good first stage.
Like the Java APIs, this relies on stub files, so we can't link to the
implementation which is a bit of a shame. However, it's a good first
step.
2020-06-24 12:12:06 +01:00
1efabccd14
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-06-21 12:09:28 +01:00
029374e9aa
Merge branch 'master' into mc-1.14.x
2020-06-21 12:08:30 +01:00
2b077554f7
Merge branch 'mc-1.14.x' into mc-1.15.x
...
# Conflicts:
# gradle.properties
# src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
# src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
# src/main/java/dan200/computercraft/core/apis/handles/HandleGeneric.java
# src/main/java/dan200/computercraft/shared/Config.java
# src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
# src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
# src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
# src/main/resources/data/computercraft/lua/rom/help/changelog.txt
# src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
2020-06-16 09:24:14 +01:00
9134f243c1
Merge branch 'master' into mc-1.14.x
2020-06-15 22:05:02 +01:00
c493d668c8
Bump version
2020-05-17 17:02:17 +01:00
d0deab3519
Update changelog to include some missing things
2020-05-15 10:48:31 +01:00
d5a8df753a
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-05-15 10:36:23 +01:00
13de2c4dd0
Fix location of cc.require
...
Yay for 1.12->1.13 changes!
2020-05-15 10:28:35 +01:00
906280225e
Merge branch 'master' into mc-1.14.x
2020-05-15 10:19:57 +01:00
abbc641fd4
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-05-13 14:36:39 +01:00
4be0b15afa
Merge branch 'master' into mc-1.14.x
2020-05-13 14:04:28 +01:00
e918f55b58
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-05-04 10:05:32 +01:00
052cf8ee7d
Merge branch 'master' into mc-1.14.x
2020-05-04 09:39:54 +01:00
76c3e4c155
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-04-29 17:37:53 +01:00
358289b5f9
Merge branch 'master' into mc-1.14.x
2020-04-29 17:37:36 +01:00
a3021c4697
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-04-24 18:44:29 +01:00
b7c61f9c6d
Bump version
2020-04-24 18:34:01 +01:00
33260a7747
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-04-23 10:04:37 +01:00
a049502d12
Merge branch 'master' into mc-1.14.x
2020-04-23 10:03:45 +01:00
d7729337ac
Merge branch 'mc-1.14.x' into mc-1.15.x
2020-04-22 10:39:00 +01:00
e5cc345f49
Some cleanup to the Lua programs
2020-04-22 10:00:43 +01:00
d847a4d9e0
Merge branch 'master' into mc-1.14.x
...
This also deletes display list support - MC 1.14 now requires VBOs to be
supported in some capacity.
2020-04-22 09:45:23 +01:00
95fee95006
Fix spelling of Ctrl
2020-02-08 20:26:16 +00:00
fb440b0d2e
Update to 1.15
...
Most of the port is pretty simple. The main problems are regarding
changes to Minecraft's rendering system.
- Remove several rendering tweaks until Forge's compatibility it
brought up-to-date
- Map rendering for pocket computers and printouts
- Item frame rendering for printouts
- Custom block outlines for monitors and cables/wired modems
- Custom breaking progress for cables/wired modems
- Turtle "Dinnerbone" rendering is currently broken, as normals are not
correctly transformed.
- Rewrite FixedWidthFontRenderer to to the buffer in a single sweep.
In order to do this, the term_font now also bundles a "background"
section, which is just a blank region of the screen.
- Render monitors using a VBO instead of a call list. I haven't
compared performance yet, but it manages to render a 6x5 array of
_static_ monitors at almost 60fps, which seems pretty reasonable.
2020-01-24 09:12:29 +00:00
bf6d017ad1
Merge branch 'master' into mc-1.14.x
2020-01-14 08:52:59 +00:00
a706300598
Update changelog/version
2020-01-13 15:10:32 +00:00
41a1b99f7d
Merge branch 'master' into mc-1.14.x
2020-01-13 15:05:50 +00:00
037cbabb32
Merge branch 'master' into mc-1.14.x
...
Unfortunately we can't apply the config changes due to backwards
compatibility. This'll be something we may need to PR into Forge.
CraftTweaker support still needs to be added.
2019-12-23 22:34:30 +00:00
92567b4d7e
Merge branch 'master' into mc-1.14.x
2019-11-29 20:23:56 +00:00
642351af1a
Merge branch 'master' into mc-1.14.x
2019-11-25 09:15:20 +00:00
3ea2d6a0a8
Merge branch 'master' into mc-1.14.x
2019-10-04 19:56:49 +01:00
81f85361d5
Move Lua files to the correct location
...
I really need to fix this.
2019-10-01 19:43:03 +01:00
d4f6a594b6
Merge branch 'master' into mc-1.14.x
2019-10-01 18:58:40 +01:00
07a56454a0
Bumpity bumpity bump
2019-08-09 09:38:30 +01:00
08d22fd3df
Fix changelog being out-of-sync
2019-08-04 11:05:14 +01:00
e6c691a8f8
Fix rom's location
...
This isn't going to get annoying or anything
2019-08-04 11:02:07 +01:00
4b0e5c445c
Merge branch 'master' into mc-1.14.x
2019-08-04 10:57:20 +01:00
57318b022d
Merge branch 'master' into mc-1.14.x
2019-06-15 08:00:20 +01:00
0f3c44c926
Merge branch 'master' into mc-1.13.x
2019-06-08 08:21:08 +01:00
b6715bd812
Fix a couple of build failures
2019-06-02 18:36:34 +01:00
c82d8a7c2a
Merge branch 'master' into mc-1.13.x
2019-06-02 16:46:45 +01:00
220e4bd660
Merge branch 'master' into mc-1.13.x
2019-04-24 10:15:33 +01:00
810258e9b8
Update and rename all resources
...
- Languages are converted to JSON
- Rename most *(_advanced) blocks to *_{advanced,normal}. It's more
verbose, but means they're sorted together.
- A couple of changes to the ROM to work with some Java changes.
- Update recipes and advancements to not use damage values.
2019-04-02 13:18:43 +01:00
5e462adc5c
Relocate all resource files
...
- textures/{block,item}s -> textures/{block,item}
- assets/*/{advancements,lua,recipes} -> data/*/...
2019-04-02 13:18:43 +01:00
SquidDev