Commit Graph

  • b8c63df11b Make build depend on generateData, and remove unmapped mods from its dependencies. Sebastian Hartte 2020-07-28 23:16:08 +02:00
  • 20fd760274 Switch to right task for data generation Sebastian Hartte 2020-07-28 22:59:58 +02:00
  • 27cdbfb7f3 Fix NPEs when the input isn't an item. Sebastian Hartte 2020-07-28 22:56:03 +02:00
  • 33d247fec8 Fix server startup, jar building and after-merge fixes. Sebastian Hartte 2020-07-28 22:45:09 +02:00
  • 75dd1d4bb6 Merge remote-tracking branch 'origin/master' into fabric-1.16 Sebastian Hartte 2020-07-28 22:08:09 +02:00
  • a8e79826bd Fix fabric-api version Sebastian Hartte 2020-07-28 21:54:10 +02:00
  • b9ece3a18a Updated Gradle Wrapper Sebastian Hartte 2020-07-28 21:44:50 +02:00
  • a628a469ce Fix refmap reference for non-dev deployment. Sebastian Hartte 2020-07-28 21:02:51 +02:00
  • 2fca330ff1 Use BlockPos.toMutable Sebastian Hartte 2020-07-28 20:25:18 +02:00
  • 3802eace7a Use StringTextComponent.EMPTY Sebastian Hartte 2020-07-28 20:24:07 +02:00
  • 2b9c997191 Fix formatting. Sebastian Hartte 2020-07-28 20:19:11 +02:00
  • 1cb32517ae Added missing chunk generator registration. Sebastian Hartte 2020-07-28 20:11:18 +02:00
  • b3b7547325 Updated mappings to 20200723-1.16.1 (#4514) yueh 2020-07-28 18:33:28 +02:00
  • 307a6817d4 Remove xvfb steps as runData should now run headless (#4513) yueh 2020-07-28 14:49:33 +02:00
  • 0beab559a6 Fix formatting yueh 2020-07-28 11:44:57 +02:00
  • a65be62cd1 Organize and clean imports yueh 2020-07-28 10:29:57 +02:00
  • e640918ca0 Compiles, can get ingame, uses Mixins to work around missing Fork Hooks for structures and custom dimensions. Sebastian Hartte 2020-07-28 02:05:24 +02:00
  • 84e6aaa122 Compiles again. Sebastian Hartte 2020-07-27 23:50:28 +02:00
  • 780f68952b Added spotless back and reformatted Sebastian Hartte 2020-07-27 20:07:27 +02:00
  • 49296915c9 Post merge fixes. Sebastian Hartte 2020-07-27 19:12:16 +02:00
  • 0fdc46b358 Merge remote-tracking branch 'origin/master' into fabric-1.16 Sebastian Hartte 2020-07-27 19:07:35 +02:00
  • c7980907ed Facade Recipe integration and cleanups Sebastian Hartte 2020-07-27 18:03:16 +02:00
  • 56ecda5173 1.16 port yueh 2020-07-22 16:44:42 +02:00
  • 662dbca3e1 Fixes #4508: Correctly construct the sparse lists. (#4511) yueh 2020-07-27 11:21:06 +02:00
  • 6cb6c21495 Mention spotlessApply. Sebastian Hartte 2020-07-26 23:29:34 +02:00
  • 79e9a3913a Update README.md to reflect that the data generation needs to be run. Sebastian Hartte 2020-07-26 23:28:49 +02:00
  • 7e89317dd5 Fix substitutions not being correctly recognized. (#4507) shartte 2020-07-26 22:25:18 +02:00
  • 59e40ccbd9 Fixes mouse handling for right-clicks to clear the search box and middle-click for crafting. (#4505) v7.0.0-beta.1 shartte 2020-07-26 16:30:53 +02:00
  • 774f88ee90 Clear searchfield on rightclick (#4503) yueh 2020-07-26 15:28:52 +02:00
  • 0528879833 Moved datagens to appeng.datagen (#4502) yueh 2020-07-26 15:28:18 +02:00
  • b6110e4f4a Remove all maven repos except modmaven (#4501) yueh 2020-07-26 15:27:32 +02:00
  • 5b82e59264 Removed superfluous crash enhancement (#4498) yueh 2020-07-26 12:42:48 +02:00
  • 3a4b171443 Fixes #4468: Default to ae serverside (#4496) yueh 2020-07-25 16:05:58 +02:00
  • 8306f5bf0a Port more stuff Sebastian Hartte 2020-07-25 02:24:36 +02:00
  • 2ac27fd9ce Fixes patterns always returning a recipe. (#4495) yueh 2020-07-24 22:39:38 +02:00
  • 5bf05f6cb1 Port more stuff Sebastian Hartte 2020-07-24 18:39:39 +02:00
  • d01aa28cdc Use standard mechanics for damaging the quartz knife. (#4494) shartte 2020-07-24 16:39:32 +02:00
  • 9fcfbf31be Lots of fixes Sebastian Hartte 2020-07-23 02:38:32 +02:00
  • 21aa5ce33b Don't use PacketBuffer#readString since it's client-only. (#4489) shartte 2020-07-22 10:22:28 +02:00
  • f7ef6eb772 Same method name as in superclass leads to ForgeGradle reobf problems. (#4491) shartte 2020-07-22 10:22:00 +02:00
  • 10037a9ac5 Correct link to CurseForge page shartte 2020-07-21 18:39:48 +02:00
  • 888de430ba Also test for generated asset cache yueh 2020-07-20 22:27:01 +02:00
  • 83d661ab2a Create sv_se.json (#4485) v7.0.0-alpha.8 A. Regnander 2020-07-20 21:33:44 +02:00
  • 1933b4b10d Merge remote-tracking branch 'origin/master' into fabric-1.16 Sebastian Hartte 2020-07-20 20:19:42 +02:00
  • 019f570331 Pattern Rendering and other Rendering Sebastian Hartte 2020-07-20 20:13:20 +02:00
  • a537bcf0ee Merge pull request #4486 from AppliedEnergistics/number-entry-dialogs shartte 2020-07-20 20:13:04 +02:00
  • 590e435ad6 Formatting fixes Sebastian Hartte 2020-07-19 23:51:57 +02:00
  • 8d92a51e4f Formatting fixes Sebastian Hartte 2020-07-19 23:50:47 +02:00
  • 4322910614 Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters. Sebastian Hartte 2020-07-19 23:50:18 +02:00
  • ebe589a714 Ported the other number entry dialogs over to the shared widget. Sebastian Hartte 2020-07-19 23:25:11 +02:00
  • 6187e6a7bb Started refactoring number entry dialogs to use shared code. Sebastian Hartte 2020-07-19 20:04:08 +02:00
  • d5f113eb35 Merge pull request #4484 from AppliedEnergistics/energy-grid-failfast shartte 2020-07-19 17:56:22 +02:00
  • 9ad5bb21c0 Merge pull request #4480 from AppliedEnergistics/mb-fixes shartte 2020-07-19 17:31:06 +02:00
  • 1c88ea7b78 Fail faster when something modifies the list of energy providers/requesters while an extract/inject operation is ongoing, since this would lead to ConcurrentModificationExceptions later, without a way of tracking down what caused the modification in the first place. Sebastian Hartte 2020-07-19 16:39:37 +02:00
  • 5a976ebfae Merge pull request #4483 from AppliedEnergistics/texture-cleanup shartte 2020-07-19 16:20:32 +02:00
  • b45669bb82 Removed several unchecked casts. Sebastian Hartte 2020-07-19 15:49:01 +02:00
  • e52cc40dbf JSON Formatting Fix Sebastian Hartte 2020-07-19 16:00:01 +02:00
  • 8a20d3c1d7 Consolidated fluid models to reuse the item counterparts with different textures. Sebastian Hartte 2020-07-19 15:00:46 +02:00
  • 749ebeb91d Moved part textures from parts to part to be consistent with singular naming used in Minecraft (and for the model directory). Sebastian Hartte 2020-07-19 14:14:18 +02:00
  • 82586732e3 Removed unused crafting and fluid terminal models and associated textures. Unified naming for textures used by the fluid terminal. Sebastian Hartte 2020-07-19 14:09:57 +02:00
  • e023d83e62 Deleted unused matrix frame related documentation images. Sebastian Hartte 2020-07-19 13:40:42 +02:00
  • de7cbc4949 Moved part-related textures from textures/item/part to textures/parts/ and adapted the level emitter item models to use the normal part texture. Sebastian Hartte 2020-07-19 13:37:23 +02:00
  • 71a91e51fb Naming improvements Sebastian Hartte 2020-07-19 13:16:50 +02:00
  • 223163aa0a Fixes #4330: Avoid mutating the input stack (#4481) yueh 2020-07-19 13:13:20 +02:00
  • bdd22093c3 Account for empty messages when drawing tooltips. Sebastian Hartte 2020-07-19 12:05:26 +02:00
  • 0367b35ce0 Never return null from Widget#getMessage since the narrator will always dereference it, leading to a crash. Sebastian Hartte 2020-07-19 12:04:15 +02:00
  • 755ac12b8a Fix SortedSet using compare for equals (#4479) yueh 2020-07-19 11:43:20 +02:00
  • d053c9b1bc Post-Merge Fixes Sebastian Hartte 2020-07-19 01:09:06 +02:00
  • be4fdfed85 Merge remote-tracking branch 'origin/master' into fabric-1.16 Sebastian Hartte 2020-07-19 01:05:14 +02:00
  • e1f9e01404 Force cluster-rebuilds on the first detected change, if their bounds do not match. Also use a client-side method to update connected textures for crafting cubes if two previously distinct clusters are connected. Refactored MBCalculator to use generics for type checks and remove more casts. Sebastian Hartte 2020-07-19 00:16:33 +02:00
  • 7121426fc9 Disable AO for the Spatial Pylon due to artifacts. Sebastian Hartte 2020-07-19 00:12:20 +02:00
  • a94e8504f8 Correctly convert milliseconds to microseconds (#4478) yueh 2020-07-18 20:51:30 +02:00
  • 9275bfe001 Split TickHandler#onTick into more specific event handlers (#4477) yueh 2020-07-18 19:35:33 +02:00
  • 19802b96e8 Rendering/Model Fixes Sebastian Hartte 2020-07-18 18:44:10 +02:00
  • 5b3c4aef79 When blocks adjacent to multiblock-capable blocks are updated, (#4474) shartte 2020-07-18 18:18:24 +02:00
  • 4a289470e2 Added a priority to IAEPowerStorage (#4473) yueh 2020-07-18 18:06:05 +02:00
  • d79c0f642c Do not allow recursive creation of multiblocks. (#4472) shartte 2020-07-18 18:00:40 +02:00
  • 9ecad8749f Added new japanese translate (#4475) aoisensi 2020-07-18 19:38:23 +09:00
  • 1e20cd8c08 Merge remote-tracking branch 'origin/master' into fabric-1.16 Sebastian Hartte 2020-07-18 01:45:43 +02:00
  • 15d4583c56 Working on Spatial Stuff. Sebastian Hartte 2020-07-17 22:38:27 +02:00
  • e8b57c6dc5 Multiblocks sometimes can't be broken because during removal, (#4469) shartte 2020-07-17 22:35:49 +02:00
  • 8142eb90a6 Added new Cell Rendering to ME Chest (#4464) shartte 2020-07-17 20:37:07 +02:00
  • 08abd4a770 Fixed formatting. Sebastian Hartte 2020-07-17 20:26:17 +02:00
  • b8722dbbc0 Do not rely on exceptions for control flow, when the cell has no fuzzy mode. Sebastian Hartte 2020-07-17 19:51:59 +02:00
  • 1ac6d5d967 Fixes creation of entangled singularities. Sebastian Hartte 2020-07-17 15:27:03 +02:00
  • 5c290789e0 Fixes #4467: Private methods also need to be annotated with @OnlyIn(Dist.CLIENT) if they use client-side classes. Sebastian Hartte 2020-07-17 12:45:17 +02:00
  • 38f6bf16f2 Updated dependencies (#4466) yueh 2020-07-15 23:25:35 +02:00
  • 0c5c23e9ff Restored more P2P Sebastian Hartte 2020-07-14 00:12:27 +02:00
  • 4953509255 P2P Fluid Tunnel Fix Sebastian Hartte 2020-07-13 17:45:40 +02:00
  • 832d4bb527 REI search integration. Sebastian Hartte 2020-07-13 13:11:32 +02:00
  • 62b02d3faf REI integration Sebastian Hartte 2020-07-13 13:02:11 +02:00
  • 188f105730 Fix the alive check for the matter cannon. Sebastian Hartte 2020-07-12 17:20:42 +02:00
  • 006316603d Tags Sebastian Hartte 2020-07-12 16:54:39 +02:00
  • 9bb23bcac8 Refactored crafting patterns (#4458) v7.0.0-alpha.7 yueh 2020-07-12 16:21:30 +02:00
  • 06735f5c39 Rewrite drive model to support custom cell models (#4459) yueh 2020-07-11 23:07:20 +02:00
  • e8143d3618 Merge pull request #4462 from AppliedEnergistics/aeplugin-loader shartte 2020-07-11 21:00:58 +02:00
  • 0d43ca15be Removed AEApi yueh 2020-07-11 19:40:34 +02:00
  • d18eabe1fc Restored the old PluginLoader as AddonLoader yueh 2020-07-11 18:40:51 +02:00
  • d9d491d51c Removed deprecated API parts (#4457) yueh 2020-07-10 19:35:29 +02:00
  • 9a5bd114a4 Updated IStorageCell docs to mention int limitations. yueh 2020-07-10 16:04:30 +02:00