Commit Graph

4 Commits

Author SHA1 Message Date
embeddedt
7b02351f11
Update for 1.18 2023-07-27 16:39:15 -04:00
embeddedt
299abeb25d
Apply merge mode change to 1.18 2023-06-27 11:03:49 -04:00
embeddedt
ce92fedf09
Give correct MC/platform info to profiler 2023-06-26 14:24:37 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-26 14:14:35 -04:00