Applied-Energistics-2

fujin/Applied-Energistics-2

Fork 0

Commit Graph

Select branches

Hide Pull Requests

7.x-1.15

8.0.x-1.16.1

AutoRotatingModelRefactor

WiFi-Terminals

autocrafting-containeritem-fix

bogofix

cell-tooltips

cit

craftingtree-tweaks

ctree-tweak

fabric/master

feature-interface-config

feature-package-pattern

fix-4768

flag-incompetable-patterns

fluid-package-rename

fluidConfigTerminal

fluidInterfaceUpgrade

giving-up

gtceu-fix

gtceu-p2p

item-issues

item-repo-sort

jei-fix

jei-recipe-improvements

jei-transfer-highlight

master

master-obsolete

metrics

mytsag-crystal-fix

oredictfixes

recursive-crafting

revert-async-repo

rfg

rv2

rv3-1.7.10

rv4-1.10

rv5-1.11

rv5-1.12

rv6-1.12

sb-annihation-plane-improvements

spotless-config

textures-next

wip

wip-is-cache

#1

#10

#100

#102

#105

#121

#126

#129

#130

#133

#137

#138

#141

#146

#147

#150

#160

#161

#166

#174

#180

#190

#192

#193

#198

#202

#218

#220

#221

#222

#223

#227

#241

#242

#243

#246

#248

#256

#258

#262

#266

#268

#273

#274

#278

#295

#298

#309

#312

#316

#322

#324

#327

#329

#330

#330

#331

#332

#334

#335

#336

#337

#338

#339

#341

#342

#343

#344

#345

#346

#347

#349

#350

#351

#353

#354

#355

#356

#359

#360

#361

#362

#363

#364

#367

#368

#370

#371

#372

#373

#374

#375

#376

#377

#378

#380

#381

#384

#385

#386

#388

#392

#393

#395

#396

#397

#398

#4

#401

#402

#405

#41

#417

#422

#423

#424

#425

#426

#428

#429

#430

#439

#439

#443

#444

#446

#448

#451

#454

#455

#458

#464

#466

#475

#478

#483

#500

#503

#507

#510

#516

#516

#522

#524

#531

#533

#545

#545

#547

#547

#548

#548

#549

#549

#550

#550

#553

#553

#554

#554

#555

#557

#557

#558

#558

#559

#561

#565

#565

#566

#566

#569

#569

#570

#570

#571

#571

#572

#572

#575

#579

#581

#583

#583

#586

#586

#588

#588

#589

#589

#591

#591

#593

#593

#595

#595

#596

#596

#600

#604

#604

#74

#88

#91

#92

#94

AE2-Unofficial-Extended-Life

Experimental-v49

fabric/v8.1.0-alpha.1

fabric/v8.1.0-alpha.10

fabric/v8.1.0-alpha.2

fabric/v8.1.0-alpha.3

fabric/v8.1.0-alpha.4

fabric/v8.1.0-alpha.5

fabric/v8.1.0-alpha.6

fabric/v8.1.0-alpha.7

fabric/v8.1.0-alpha.8

fabric/v8.1.0-alpha.9

om

omn

omni-fixes-v10

omni-fixes-v11b

omni-fixes-v12

omni-fixes-v13

omni-fixes-v16b

omni-fixes-v16c

omni-fixes-v17

omni-fixes-v18

omni-fixes-v19

omni-fixes-v20

omni-fixes-v21b

omni-fixes-v22

omni-fixes-v23

omni-fixes-v24

omni-fixes-v25

omni-fixes-v26b

omni-fixes-v27

omni-fixes-v28

omni-fixes-v28c

omni-fixes-v29

omni-fixes-v30d

omni-fixes-v30e

omni-fixes-v31

omni-fixes-v32b

omni-fixes-v33

omni-fixes-v33b

omni-fixes-v34b

omni-fixes-v34d

omni-fixes-v35

omni-fixes-v36

omni-fixes-v37

omni-fixes-v38

omni-fixes-v39

omni-fixes-v40

omni-fixes-v41

omni-fixes-v42

omni-fixes-v43

omni-fixes-v44

omni-fixes-v45

omni-fixes-v46

omni-fixes-v47

rv2.beta.1

rv2.beta.10

rv2.beta.11

rv2.beta.12

rv2.beta.13

rv2.beta.14

rv2.beta.15

rv2.beta.16

rv2.beta.17

rv2.beta.18

rv2.beta.19

rv2.beta.2

rv2.beta.20

rv2.beta.21

rv2.beta.22

rv2.beta.23

rv2.beta.24

rv2.beta.25

rv2.beta.26

rv2.beta.27

rv2.beta.28

rv2.beta.29

rv2.beta.3

rv2.beta.30

rv2.beta.31

rv2.beta.32

rv2.beta.33

rv2.beta.4

rv2.beta.5

rv2.beta.6

rv2.beta.7

rv2.beta.8

rv2.beta.9

rv2.stable.1

rv2.stable.10

rv2.stable.2

rv2.stable.3

rv2.stable.4

rv2.stable.5

rv2.stable.6

rv2.stable.7

rv2.stable.8

rv2.stable.9

rv3.alpha.1

rv3.alpha.10

rv3.alpha.11

rv3.alpha.12

rv3.alpha.13

rv3.alpha.2

rv3.alpha.3

rv3.alpha.4

rv3.alpha.5

rv3.alpha.6

rv3.alpha.7

rv3.alpha.8

rv3.alpha.9

rv3.beta.1

rv3.beta.2

rv3.beta.3

rv3.beta.4

rv3.beta.5

rv3.beta.6

rv4.alpha.10

rv4.alpha.11

rv4.alpha.2

rv4.alpha.3

rv4.alpha.4

rv4.alpha.5

rv4.alpha.6

rv4.alpha.7

rv4.alpha.8

rv4.alpha.9

rv4.stable.1

rv5.alpha.1

rv5.alpha.2

rv5.alpha.3

rv5.alpha.4

rv5.alpha.5

rv5.alpha.6

rv5.alpha.7

rv5.alpha.8

rv5.beta.1

rv5.beta.2

rv5.beta.3

rv5.stable.1

rv5.stable.10

rv5.stable.11

rv5.stable.2

rv5.stable.3

rv5.stable.4

rv5.stable.5

rv5.stable.6

rv5.stable.7

rv5.stable.8

rv5.stable.9

rv6.alpha.1

rv6.alpha.2

rv6.alpha.3

rv6.alpha.4

rv6.beta.1

rv6.stable.1

rv6.stable.2

rv6.stable.3

rv6.stable.4

rv6.stable.5

rv6.stable.6

rv6.stable.7

v0.56.0

v0.56.1

v0.56.2

v0.56.3

v0.56.4

v0.56.5

v0.56.6

v0.56.7

v7.0.0

v7.0.0-alpha.2

v7.0.0-alpha.3

v7.0.0-alpha.4

v7.0.0-alpha.5

v7.0.0-alpha.6

v7.0.0-alpha.7

v7.0.0-alpha.8

v7.0.0-beta.1

v7.0.0-beta.2

v7.0.1

v7.0.2

v7.0.3

v7.0.4

v8.0.0-alpha.1

v8.0.0-alpha.2

v8.0.0-alpha.3

v8.0.0-beta.1

v8.0.0-beta.2

v8.0.0-beta.3

v8.0.0-beta.4

v8.1.0-alpha.1

v8.1.0-alpha.2

v8.1.0-alpha.3

0ac83b04c9 Changed Package Names. AlgorithmX2 2014-05-27 12:15:49 -05:00
ac8effba3b Change path to layers. AlgorithmX2 2014-05-27 12:14:35 -05:00
ec58bdb879 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 AlgorithmX2 2014-05-27 12:07:20 -05:00
eb8e8da0a2 Removed Layers from API - I'm sick of people commenting on it. AlgorithmX2 2014-05-27 12:06:55 -05:00
9b8596dc7c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-26 10:59:03 -05:00
3ac94550e5 Seeds can now be planted via Formation Planes. AlgorithmX2 2014-05-26 10:58:41 -05:00
161f88e42c Added Paint Balls. Added Color Applicator. AlgorithmX2 2014-05-26 03:26:37 -05:00
82ac1eb2e7 Add support for Mouse Wheel Event passing to Items. the clean way. AlgorithmX2 2014-05-26 03:25:17 -05:00
425f144f25 And again! AlgorithmX2 2014-05-25 20:59:15 -05:00
2f59aa2228 Port Update from rv0 AlgorithmX2 2014-05-25 20:59:04 -05:00
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. AlgorithmX2 2014-05-25 20:58:44 -05:00
ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-25 18:35:44 -05:00
6b0fa0f142 Clear Memory Card When Shift Clicking on a non-machine / air. Fixed Tooltip to properly localize names. AlgorithmX2 2014-05-25 18:32:16 -05:00
cbc2486161 Copy Item Stack before manipulating DSU. AlgorithmX2 2014-05-25 17:43:42 -05:00
fa376237fd remove unused variable, and added lumen cable. AlgorithmX2 2014-05-25 17:43:17 -05:00
7b33635c47 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-25 11:07:18 -05:00
4cf6f4e5f9 Don't Show Energy Cell info if the NBT Came from the client. AlgorithmX2 2014-05-25 11:06:59 -05:00
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-25 00:03:27 -05:00
8f474b8baf Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8 AlgorithmX2 2014-05-24 23:55:13 -05:00
baefedc4b8 ME Chest can have its drive removed via automation via the front slot. AlgorithmX2 2014-05-24 23:49:24 -05:00
a861f09b01 ME Chest insertion behavior fixed. ME Chest drive slot now properly accessible from front drive face. ME Chests can now function as tanks. ( fluid cells from extra cells ) ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. ) Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18 AlgorithmX2 2014-05-24 18:25:22 -05:00
aa6d05af2e Fixed a potential crash when picking up items. AlgorithmX2 2014-05-24 18:23:40 -05:00
1b207a17e9 API Update. AlgorithmX2 2014-05-24 18:23:23 -05:00
d5cfa12f76 Added Energy Cells Charge levels to Waila AlgorithmX2 2014-05-24 18:22:50 -05:00
397dbe8d10 Added Next button. Added text for Amount gui. AlgorithmX2 2014-05-24 16:16:22 -05:00
82a8e2d045 Fixed http://openeye.openmods.info/crashes/df3cca6850f2c037b6adb8d8d641b22f Improved Exception for http://openeye.openmods.info/crashes/d2df850ad1915a015a80f9f7cef56ac3 Improved Exception for http://openeye.openmods.info/crashes/c8a3f70288f017726c5acd09ea91a2b0 AlgorithmX2 2014-05-24 11:02:24 -05:00
5f21711204 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-24 10:40:16 -05:00
6e1a0aabb6 Server doesn't have noTesr Tiles. AlgorithmX2 2014-05-24 10:29:45 -05:00
f5976e7b1d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-23 23:23:15 -05:00
832c4ecdb9 Only show crafting/stored/both where applicable. AlgorithmX2 2014-05-23 23:21:10 -05:00
bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" AlgorithmX2 2014-05-23 23:20:56 -05:00
26dcae3f9b Send Crafting Gui Packet to open second gui. AlgorithmX2 2014-05-23 20:35:27 -05:00
ea936d3b72 Null classes are bad umm kay. AlgorithmX2 2014-05-23 15:51:25 -05:00
a3264d03e2 Crafting CPUs now appear offline unless hey have their channel requirement met. Also their status shows in waila. AlgorithmX2 2014-05-22 21:43:15 -05:00
ef4cab8f61 Storage grid can now properly see crafting grid. AlgorithmX2 2014-05-22 21:42:27 -05:00
168309ee50 Fixed Outputs for non-crafting Patterns. AlgorithmX2 2014-05-22 21:41:54 -05:00
26540869ba removed dead code. AlgorithmX2 2014-05-22 21:41:35 -05:00
e47bc5965d Update interface crafting lists. AlgorithmX2 2014-05-22 21:41:24 -05:00
e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo AlgorithmX2 2014-05-22 21:41:09 -05:00
5f5fc4cee1 Fixed Crafting MB Names. AlgorithmX2 2014-05-22 21:39:21 -05:00
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-22 18:49:02 -05:00
15aa825d30 Added Comments for Enum Settings. Added Comment for wireless equation. Removed Alpha Migration Option. AlgorithmX2 2014-05-22 16:29:10 -05:00
f0ad27c5f3 Fixed http://openeye.openmods.info/crashes/64eb336042aeeec45dfd13edd30de8a6 Fixed http://openeye.openmods.info/crashes/bbefcf763be5224e4667519cf6c95933 AlgorithmX2 2014-05-22 09:20:59 -05:00
f4706d6612 Fixed Issue with NEI Grindstone Plugin pulling up the inscriber instead of the grindstone. AlgorithmX2 2014-05-21 22:35:40 -05:00
e27bb272cf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 AlgorithmX2 2014-05-21 21:09:38 -05:00
cbe41337ed Added Clear and Partition Based on contents to Storage Bus. AlgorithmX2 2014-05-21 21:09:29 -05:00
459239bfba Storage Buses no update their filters when their upgrades change. AlgorithmX2 2014-05-21 21:09:13 -05:00
a8a4476e8e Fixed issue with ore cache, should now properly contain all the options instead of just the current item. AlgorithmX2 2014-05-21 21:08:38 -05:00
569ed2f99e Bad Fuzzy Logic for Non-Damageable Items. AlgorithmX2 2014-05-21 21:08:13 -05:00
6f8a367192 WTF is java making this stupid class for! AlgorithmX2 2014-05-21 13:24:58 -05:00
cb0a450853 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-21 09:44:02 -05:00
0f781cebba Sided TIlehash should make order matter. AlgorithmX2 2014-05-21 09:43:41 -05:00
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-20 22:17:52 -05:00
dc0c015a97 Fix NPE. AlgorithmX2 2014-05-20 22:06:48 -05:00
0b04d2853e Add backwards support for MJ5 ( from MJ6 ) Add another try catch facade test... AlgorithmX2 2014-05-20 22:06:37 -05:00
0e59831fd6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-20 09:50:10 -05:00
80428aec4e Fixed Bug: #0445 - ASM Migration AlgorithmX2 2014-05-20 09:38:29 -05:00
7a3f2dcf5a Don't call Grid cache updates if the grid is empty. AlgorithmX2 2014-05-20 09:37:53 -05:00
db8c29a9b4 Pattern registration still a work in progress. AlgorithmX2 2014-05-19 23:13:43 -05:00
fa1feff8f0 Added View Button ( dosn't work ) AlgorithmX2 2014-05-19 23:13:25 -05:00
24e76e5a88 Crafting Cache Registered and added events. AlgorithmX2 2014-05-19 23:13:12 -05:00
ec3cb8737a Crafting patterns are not iron nuggets AlgorithmX2 2014-05-19 23:12:49 -05:00
bd926374db Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-18 21:42:43 -05:00
2cf84989d1 IC2 Double Buffer Approach. AlgorithmX2 2014-05-18 21:36:32 -05:00
37d7675ad7 Darn it Power tunnels need power too! AlgorithmX2 2014-05-18 21:36:21 -05:00
2ee583cf8e Protect from NEI Crashes. AlgorithmX2 2014-05-18 21:36:08 -05:00
68993534d9 Slowly working towards crafting. AlgorithmX2 2014-05-18 20:05:03 -05:00
440ac95dc4 Change Tooltip for clear button in Crafting Terminal. AlgorithmX2 2014-05-18 14:53:18 -05:00
c35faabfd8 Fixed Bug: #0436 - Fluid Tunnels don't require Power Fixed bug where fluid tunnels would not function properly. AlgorithmX2 2014-05-18 14:44:58 -05:00
b15d3af12b Crafting CPU basics. AlgorithmX2 2014-05-17 22:19:23 -05:00
8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-15 21:43:11 -05:00
6f96ae6074 Removed Alpha Migration. Fixed a crash when AE is rendering as a FMP Part. Meteorite Loot is now less random. Added support for CLApi ( might be neat as it develops ) AlgorithmX2 2014-05-15 21:18:30 -05:00
d10e7ee6df Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-15 09:35:56 -05:00
cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. AlgorithmX2 2014-05-15 09:34:38 -05:00
9ba1b133d7 Fixed Bug: #0432 - Weird Inventory behavior in Quartz Cutting Knife Removed logging from Migration Items. Improved logging for http://openeye.openmods.info/crashes/42defba4fcc4c4571a45edaaba3af4c3 Improved logging for http://openeye.openmods.info/crashes/cbda180edb2fba39c4fe27a7f5266fec AlgorithmX2 2014-05-14 10:55:45 -05:00
f87e7a4ee8 Fixed Right Click Terminal Slots. AlgorithmX2 2014-05-13 23:33:48 -05:00
322b0a7da7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-13 21:57:17 -05:00
974a41eabb Solved the mystery of the broken lighting. AlgorithmX2 2014-05-13 21:56:57 -05:00
6a8fafa58d Working Towards Crafing CPU MultiBlock AlgorithmX2 2014-05-13 21:42:14 -05:00
25a588f303 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 AlgorithmX2 2014-05-13 19:25:07 -05:00
62aa5c4175 Minor derp. AlgorithmX2 2014-05-12 23:28:29 -05:00
14b7fe8a42 Add better custom security features. AlgorithmX2 2014-05-12 23:15:46 -05:00
ff12aa1673 Added Shit+Mouse wheel to pick up / drop items. Added Partial ItemStack packets to report to the server what itemstack is the target of interation. Fixed Repairing Items in CraftingTerminal. AlgorithmX2 2014-05-12 23:11:19 -05:00
9ba6f195fd Removed Logging from BC Tunnel. AlgorithmX2 2014-05-12 21:20:22 -05:00
2bba4740a9 removed "___ reports to use MC ticking, but also requests Network Based Ticking." AlgorithmX2 2014-05-12 21:19:18 -05:00
45c292344f Fixed Dormant Chunk Cache. AlgorithmX2 2014-05-12 21:15:45 -05:00
b2d240b6cc Crash Enhancement Tweak! AlgorithmX2 2014-05-12 21:15:31 -05:00
c72b272da9 Merge branch 'mj6' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 AlgorithmX2 2014-05-11 17:06:33 -05:00
1f73d68bb3 Upped another 30k packet limit to 2mb AlgorithmX2 2014-05-11 17:02:53 -05:00
9f0e31b303 prevent crash with derpy facades. AlgorithmX2 2014-05-11 17:01:48 -05:00
f4e685a0e8 Fix Crashes for MJ5. Disable MJ6 AlgorithmX2 2014-05-11 17:01:31 -05:00
be645f3e2f MJ 6 + MJ 5 Integration. AlgorithmX2 2014-05-11 16:13:37 -05:00
ce561ffbe3 Merge in Builder support. AlgorithmX2 2014-05-11 13:48:14 -05:00
02ace8145f Current for BC 6.0.12 release AlgorithmX2 2014-05-11 13:31:25 -05:00
a04bc65e35 Code Style / Cleanup AlgorithmX2 2014-05-11 13:30:54 -05:00
34048d45a2 Don't erase inventory when someone asks for the drops... AlgorithmX2 2014-05-11 13:30:36 -05:00
bd5e80fba1 Facades should use names, not ids. AlgorithmX2 2014-05-11 11:41:31 -05:00
f7e638c172 changing facades now updates the world render. AlgorithmX2 2014-05-11 11:30:00 -05:00
9ad9c7b370 Added BC 6x support for facades and added builder support. AlgorithmX2 2014-05-11 11:28:34 -05:00
1f126054e4 Moved NEI Helpers. AlgorithmX2 2014-05-11 11:27:32 -05:00

... 42 43 44 45 46 ...