AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,671 Commits 29 Branches 143 Tags
Commit Graph

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
495ec3a869 Made prints rotatable around y axis. 2015-03-24 02:39:09 +01:00
Florian Nücke
a906759283 Cleanup. 2015-03-24 01:40:58 +01:00
Florian Nücke
3625626fe5 Textures and model for printer, nicer rendering. 
Inventory and item entity rendering for prints.
 2015-03-24 01:31:34 +01:00
Florian Nücke
d45cc724b5 Refactoring. 2015-03-24 00:03:01 +01:00
Florian Nücke
bdc006d31e Redstone logic for printed blocks. 2015-03-23 23:41:07 +01:00
Florian Nücke
311973e33e Materials for printing (plastic and ink). 2015-03-23 21:02:08 +01:00
Florian Nücke
1d7b6caa6f Printer block to allow printing 3d prints. 2015-03-23 17:58:41 +01:00
Florian Nücke
bb3456d86e Added block type with data driven model, stored in item stack. 2015-03-23 05:00:57 +01:00
Florian Nücke
799224e92b Also calling doCustomInit on client side. 2015-03-23 04:59:49 +01:00
Florian Nücke
21af1160df Fixes access to client-only method on server side... closes #969. 2015-03-22 13:22:09 +01:00
Florian Nücke
b6d88b4eac Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-16 00:02:01 +01:00
Florian Nücke
19c9ed70b9 Changed Lua BIOS label to make it easier to find. 2015-03-16 00:01:30 +01:00
Florian Nücke
1da67180ed Fix sets not being converted properly for Lua (e.g. the result of me_controller.getCpus() was being toStringed). 2015-03-13 20:18:01 +01:00
Florian Nücke
277cc20bf7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/integration/vanilla/DriverInventory.java
	src/main/scala/li/cil/oc/server/component/traits/WorldAware.scala
 2015-03-13 09:34:47 +01:00
Florian Nücke
3a20897754 Fix angel upgrade, closes #960. 2015-03-13 09:20:00 +01:00
Florian Nücke
c0690bb07f Firing PlayerInteractEvent when agents (robots, drones) are interacting with in-world inventories and in the inventory driver. See #900. 
Hopefully doesn't break anything...
 2015-03-11 15:45:29 +01:00
Florian Nücke
ffd38e59ff Allow getting array with input / output for all colors for bundled redstone. Closes #958. 
To  get this, do not pass a color value to the corresponding getter method.
Note: the returned table is zero indexed to allow treating it the same as the methods, i.e. use the `colors` library to index colors by name e.g.
 2015-03-11 14:37:13 +01:00
Florian Nücke
7a7a23ee8d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
 2015-03-09 16:49:48 +01:00
Florian Nücke
49c967cdcf Fix sound handler potentially leaking memory by keeping references to tile entities from unloaded worlds. 2015-03-09 16:41:14 +01:00
Florian Nücke
5358c8b814 Fixed screens potentially preventing chunks to unload. 2015-03-09 16:36:25 +01:00
Florian Nücke
55fa47a95c Herp derp. Corrects last commit. 2015-03-09 03:55:08 +01:00
Florian Nücke
5ec299ab5a Re-enabling RF power interface injection for #953. 2015-03-09 03:49:14 +01:00
Florian Nücke
5e644c9929 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
 2015-03-09 03:45:36 +01:00
Florian Nücke
f044c5b96f Bump version number. 2015-03-09 03:40:47 +01:00
Florian Nücke
93b7dd63f7 Fixes LuaJ fallback, closes #954. 2015-03-09 03:40:34 +01:00
Mstrodl
9fa703c0f9 Update robot.names 2015-03-07 20:35:08 -05:00
Florian Nücke
d39ce433ed Might fix a memory leak. 2015-03-05 19:15:10 +01:00
Florian Nücke
1f0a00cf35 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2015-03-01 19:54:16 +01:00
Florian Nücke
f498deba26 Fix potential NPE in directory listing, should close #947. 2015-03-01 19:52:26 +01:00
Florian Nücke
f4f6881bdd Trying to prevent NPE in item cost computation. 2015-02-28 20:36:04 +01:00
Florian Nücke
0c120022b6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-27 12:55:47 +01:00
Florian Nücke
56184a210a Fixed potential NPE in robot update. 2015-02-27 12:55:16 +01:00
Florian Nücke
bd77abe4f9 Fixes #943. 2015-02-27 07:06:09 +01:00
Florian Nücke
4ceb63e5fb Fix initial color value for cables when placed as multiparts, closes #942. 2015-02-26 23:03:13 +01:00
Florian Nücke
046c6f5ec8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Achievement.scala
 2015-02-26 19:15:07 +01:00
Florian Nücke
d906ae50d8 Less ambiguous... -.- 2015-02-26 19:14:17 +01:00
Florian Nücke
b6837d1583 Renamed some internal constants for consistency. 
Fixed change to OpenOS disk creation in last commit / merge.
 2015-02-26 19:09:06 +01:00