AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 09:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,543 Commits 29 Branches 143 Tags
Commit Graph

3543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
221f42bb2e Not making mod integration depend on whether power use is enabled or not... closes #992. 2015-03-31 18:12:50 +02:00
Florian Nücke
ef86ca01c8 Added drivers for the separate RF energy APIs, closes #989. 2015-03-31 13:35:45 +02:00
Florian Nücke
ff85880a96 This *should* fix the NPE in AE2 integration with versions 20 and up. Can't fully test it because it crashes when I interact with terminals. Closes #978. Again. 2015-03-31 01:57:39 +02:00
Florian Nücke
b021641efe Allow filtering items when querying lists from AE2 networks, closes #856. 
`me_controller.getCraftables` and `me_controller.getItemsInNetwork` now take an optional table argument. This table is a filter applied to the result. Its format is the same as item stack representations. For example, a full filter could be:
```
{
  damage = 0,
  maxDamage = 0,
  size = 12,
  maxSize = 64,
  hasTag = false,
  name = "minecraft:stick,
  label = "Stick"
}
```
 2015-03-31 00:30:07 +02:00
Florian Nücke
f4bcb0718e Populate tablet_use info with sign text if sign upgrade is installed, closes #988. 2015-03-30 23:50:58 +02:00
Florian Nücke
4d5c923c42 Allow recycling prints by using them as material input for printers, closes #986. 2015-03-30 23:36:27 +02:00
Florian Nücke
b2a0a8d90c Updated BuildCraft dependency. 2015-03-30 18:33:19 +02:00
Florian Nücke
20715298e0 Re-enabling AE2 integration for newer version, because issue seems to be fixed as of version rv2-beta-22. 2015-03-30 17:57:27 +02:00
Florian Nücke
6afc31b624 Updated some dependencies, should close #984. 
Also updated Forge to allow running mods in dev env that depend on it (such as AE2).
 2015-03-30 17:34:15 +02:00
Florian Nücke
4b354551a0 Fixed wrong UV mapping on 3D prints (in particular the item renderer). 2015-03-30 16:45:45 +02:00
Florian Nücke
5506375bf2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-03-30 13:49:32 +02:00
Florian Nücke
952d5f2038 Should fix a few issues with the experimental memory leak fix, such as robots shutting down when moving. 2015-03-30 13:49:18 +02:00
Florian "Sangar" Nücke
a836a42a5e Merge pull request #983 from Vexatos/patch-17 
Mandatory OPPM Update
 2015-03-30 13:06:05 +02:00
Vexatos
e48004f1b4 Just a small and important change 2015-03-30 13:03:04 +02:00
Vexatos
6115617ce0 Update oppm.lua 2015-03-30 09:53:49 +02:00
Florian Nücke
d13cdc0cd8 Somewhat experimental fix for memory leaks seen in Microcontrollers. If you notice any new issues after this, please do let me know. 
This essentially schedules machines for full cleanup at a later point, to allow executor threads to finish (can't close states while they're running, don't want to wait for them to finish to avoid lagging servers).
 2015-03-29 22:45:43 +02:00
Florian Nücke
5e9861d04a Temporarily disabling AE2 integration for rv2-beta-20 and newer due to methods that were deprecated in the API crashing now. 2015-03-29 13:24:43 +02:00
Florian Nücke
d2d51b9122 Because the compiler told me to. 2015-03-29 13:23:08 +02:00
Florian Nücke
fa5a6f14b0 Might make #973 go away. 2015-03-27 19:25:39 +01:00
Florian Nücke
ef6d251c30 Oops, that went directly into the stable branch earlier. 2015-03-27 15:52:22 +01:00
Florian Nücke
b6d20aa344 Made printer easier to automate (piping out of it will now only extract "outputs", i.e. empty ink cartridges and prints). 2015-03-26 18:47:13 +01:00
Florian Nücke
1bfd54091a Made save format for 3D printed shapes more compact. 
Old format can still be loaded.
 2015-03-26 16:40:11 +01:00
Florian Nücke
c80adbb23c Made block detection for agents more detailed, checking for "passable" blocks (ones without collision bounds). Closes #972. 2015-03-26 13:57:50 +01:00
Florian Nücke
6ce2256b0f Fixed assembler only working if more than a certain amount of energy was available. 
Fixed bug in energy change logic.
 2015-03-26 07:39:52 +01:00
Florian Nücke
ff2ca21edb Added FMP compatibility to 3D prints \o/ 2015-03-26 07:09:45 +01:00
Florian Nücke
2af6242086 Improved printer's progress bar behavior a bit more. 
Increased max shapes per print state to 24.
 2015-03-26 00:56:57 +01:00
Florian Nücke
3e72a08017 Made the "progress" arrow in the printer GUI correspond to actual completion progress. 
Increased energy required for a single print.
 2015-03-25 22:43:09 +01:00
Florian Nücke
04e305bea6 Fixed printer printing a model even if limit is set to zero. 
Some cleanup.
 2015-03-25 19:40:35 +01:00
Florian Nücke
5503e3e283 Fixed isSolid check on rotated prints. 2015-03-25 11:09:01 +01:00
Florian Nücke
0a9839b0f2 Made graphic for material indicator bar in printer GUI darker to make it more visible. 2015-03-25 10:54:47 +01:00
Florian Nücke
50b496af2c Fixed potential flickering in print item rendering, the lazy way. 2015-03-25 10:46:16 +01:00
Florian Nücke
26ad22e990 Fixed Chamelium block drops / picking. 2015-03-25 10:37:01 +01:00
Florian Nücke
869f1380ac Allow crafting prints with blocks of iron/gold/emerald/diamond blocks to create a beacon base capable print, as suggested by DeathRtH via Kodos. 2015-03-25 10:28:33 +01:00
Florian Nücke
2757733944 Added Chamelium block, mostly for the clean texture to use in prints. 2015-03-25 10:04:59 +01:00
Florian Nücke
238436a68b Fixed mv.lua deleting source file even if target already exists. Closes #971. 2015-03-25 08:58:30 +01:00
Florian Nücke
a829a7f64a Allow applying tint to shapes of 3d prints. 2015-03-25 01:58:32 +01:00
Florian Nücke
b9b7f41884 Added limiting to number of blocks printed, defaults to one, optional parameter to printer3d.commit(). 2015-03-24 22:37:19 +01:00
Florian Nücke
f150db952e Fixed build (y u no tell me dis stuff IntelliJ...) 2015-03-24 18:34:47 +01:00
Florian Nücke
2de2049a2f Recipe for printer. 2015-03-24 18:19:11 +01:00
Florian Nücke
6eafc4996d Bump version. 2015-03-24 17:17:05 +01:00
Florian Nücke
6ccf328752 Merge branch '3d-printer' into master-MC1.7.10 
Conflicts:
	src/main/resources/application.conf
	src/main/scala/li/cil/oc/Settings.scala
 2015-03-24 17:16:42 +01:00
Florian Nücke
ab7e371fe1 Fixed isSolid check in 3d prints. Made Z in shape declaration go to the back to make it more intuitive. 2015-03-24 16:44:53 +01:00
Florian Nücke
72c73f4cc7 Added tool to display block texture names, for use in 3D shape definitions. 2015-03-24 16:02:42 +01:00
Florian Nücke
fe68cb7759 Default missing texture texture for missing textures. 2015-03-24 15:39:45 +01:00
Florian Nücke
e0645f061c Increase max label length a little. 2015-03-24 15:19:10 +01:00
Florian Nücke
47b6b27884 A little less intense on material consumption. 2015-03-24 15:01:00 +01:00
Florian Nücke
652bf48478 Avoid inaccuracies on rotated prints (to make sure solid faces are still recognized as such, e.g. for placing levers/torches). 2015-03-24 14:59:29 +01:00
Florian Nücke
f9736a792a Fixed transmitting fill state (y u only short for progress bars MC). Using custom logic for synchronizing container data now. 
Tweaked power values a bit.
 2015-03-24 14:37:34 +01:00
Florian Nücke
4781f2be46 Added setting to allow specifying custom priority for worker threads. 2015-03-24 12:51:11 +01:00
Florian Nücke
9898428cc0 More fine-grained collision / bounding box logic for prints. 2015-03-24 03:13:12 +01:00