Commit Graph

20 Commits

Author SHA1 Message Date
Sebastian Hartte 9e4f51db6e Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
#	src/main/java/appeng/entity/TinyTNTPrimedEntity.java
2020-08-18 01:37:21 +02:00
shartte b8d4f0cffa Fixes #4611: Use of client-side only method for Tiny TNT explosion. (#4612) 2020-08-18 01:35:31 +02:00
Sebastian Hartte b1feeca41c Fixup imports + formatting. 2020-08-15 03:18:23 +02:00
Sebastian Hartte 1b31185cdb Ported to 1.16.2-pre 2020-08-01 17:14:12 +02:00
Sebastian Hartte 84e6aaa122 Compiles again. 2020-07-27 23:50:28 +02:00
Sebastian Hartte 780f68952b Added spotless back and reformatted 2020-07-27 20:07:27 +02:00
yueh 56ecda5173 1.16 port 2020-07-27 11:21:50 +02:00
Sebastian Hartte 19802b96e8 Rendering/Model Fixes 2020-07-18 18:44:10 +02:00
yueh 0d43ca15be Removed AEApi
Moved all internal access to the internal `Api` class using a new static
getter.
2020-07-11 19:40:34 +02:00
Sebastian Hartte 2642ced86b Moving to source sets 2020-07-01 23:36:51 +02:00
yueh d79d284690 Fix formatting 2020-06-29 22:17:25 +02:00
Sebastian Hartte 7233b11284 Fix TinyTNT not spawning the correct entity client-side (and the renderer using the wrong shadow). 2020-06-29 21:14:58 +02:00
Sebastian Hartte 0d63f560d3 More moves and compilation fixes 2020-06-29 02:15:31 +02:00
Sebastian Hartte f5412152a4 Utils ported 2020-06-28 15:47:44 +02:00
Sebastian Hartte fee5b7fdfc Utils ported 2020-06-28 03:41:44 +02:00
Sebastian Hartte b79cd732b2 Fabric port in progress 2020-06-27 23:25:38 +02:00
Sebastian Hartte 80fbb58d4f API compiles 2020-06-27 18:09:44 +02:00
Sebastian Hartte ba71a82288 Migrations 2020-06-27 16:18:20 +02:00
Sebastian Hartte 26bb08ddb5 Post-Rename Formatting Fixes 2020-06-22 13:25:38 +02:00
Sebastian Hartte b4471b1abb The Great Renamening of 2020 2020-06-22 13:21:23 +02:00