d4efacd40a
Turn a nil to a string
...
Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.
2021-07-15 10:54:30 +01:00
9134f243c1
Merge branch 'master' into mc-1.14.x
2020-06-15 22:05:02 +01:00
358289b5f9
Merge branch 'master' into mc-1.14.x
2020-04-29 17:37:36 +01:00
a049502d12
Merge branch 'master' into mc-1.14.x
2020-04-23 10:03:45 +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
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
4b0e5c445c
Merge branch 'master' into mc-1.14.x
2019-08-04 10:57:20 +01:00
c82d8a7c2a
Merge branch 'master' into mc-1.13.x
2019-06-02 16:46:45 +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
SkyTheCodeMaster