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

3317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
1da67a0dc6 Build script cleanup and improvements. 2014-09-06 17:06:31 +02:00
Florian Nücke
aa4601c276 Build script cleanup. 2014-09-06 16:54:57 +02:00
Florian Nücke
186596c6d1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-09-06 01:45:38 +02:00
Florian Nücke
2cb173af18 So devvy. 2014-09-06 01:45:15 +02:00
Florian Nücke
d6b248edac Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-09-06 01:19:12 +02:00
Florian Nücke
32cd6fa61e Non-debug libs. 2014-09-06 01:10:45 +02:00
Florian Nücke
1b4d42b480 Fixed the GT recipe set. I think. Closes #355. 2014-09-05 23:01:34 +02:00
Florian Nücke
2dd2408cbf Fixed Waila stuff. 
Using maven for Waila API.
 2014-09-05 18:19:14 +02:00
Florian Nücke
c5845ead53 Saving robot UUID. 2014-09-05 16:35:55 +02:00
Florian Nücke
632080cb92 Using UUID of player that placed a robot for that robot, may help with permission systems. 2014-09-05 15:50:06 +02:00
Florian Nücke
53bf543611 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-05 15:14:20 +02:00
Florian Nücke
b72ea5a241 Fixed a few recipes. v1.3.4 2014-09-05 15:10:16 +02:00
Florian Nücke
c7e8beece6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-05 13:11:03 +02:00
Florian Nücke
827f6ad4d8 Made edit create a temporary backup of the file being edited when saving, to avoid losing data when erroring while saving (e.g. out of memory). Closes #534. 2014-09-05 12:03:18 +02:00
Florian Nücke
07694cdb1f Added sanity check in player inventory layouting code for GUIs, fixes #541. 2014-09-05 11:41:39 +02:00
Florian Nücke
9829f923ab Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.gradle
	gradle/forge.gradle
 2014-09-04 17:04:55 +02:00
Florian Nücke
82d8fd8c51 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-04 16:59:32 +02:00
Florian Nücke
4f2b942f73 Improved parameter validation for internet.connect, closes #533. 2014-09-04 16:47:47 +02:00
Florian Nücke
9ae5fbc512 Throwing everything into main gradle file after all (sort of in preparation for submodules, since I expect it to be easier this way). 2014-09-04 16:45:12 +02:00
Florian "Sangar" Nücke
73dd99072a Merge pull request #531 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-09-02 16:58:12 +02:00
Crawling Mist
b36d3e46db Update zh_CN.lang 
Add translation for'Tablet Case', and change few things.
 2014-09-02 22:20:32 +08:00
Florian "Sangar" Nücke
6cf8a54cf8 Merge pull request #528 from logangorence/master 
Fixed a few small typos.
 2014-09-01 12:27:20 +02:00
Logan Gorence
26c47a6d8c Fixed a few small typos. 2014-08-31 20:44:39 -07:00
Florian Nücke
0f4bb7876c Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
 2014-08-31 22:38:47 +02:00
Florian Nücke
59e0191914 Fixed remote terminals being broken since a36a0b525ccaea10f27a6d3ae38f037d72c452c1. 
Fixed a race condition in tablet caching.
 2014-08-31 22:36:33 +02:00
Florian Nücke
6f1b9814da Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	README.md
	build.properties
	gradle/forge.gradle
 2014-08-31 12:26:27 +02:00
Florian Nücke
c130594124 Some more housekeeping and a bit of recipe tweakery. 2014-08-31 08:40:42 +02:00
Florian Nücke
ce1f33c141 Housekeeping. 2014-08-31 07:21:24 +02:00
Florian Nücke
f7a0db3ab9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-08-30 20:13:21 +02:00
Florian Nücke
ace495ebea Added tablet template for assembler and fixed a couple of small issues related to that and tablets in general. 2014-08-30 19:59:54 +02:00
Florian Nücke
f3ee91fcb6 Updated MFR RedNet API. Closes #525. 2014-08-30 14:08:03 +02:00
Florian Nücke
69f11760b5 1.7 adjustments. 2014-08-29 21:55:34 +02:00
Florian Nücke
f1e47015b3 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-29 21:50:50 +02:00
Florian Nücke
89072101f4 Fixed some slots being invisible due to the last commit. 2014-08-29 21:50:34 +02:00
Florian Nücke
a6031c2b89 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-29 21:40:58 +02:00
Florian Nücke
0224fa262d Cleaned up a bit. 2014-08-29 21:40:39 +02:00
Florian Nücke
4deab5dbb4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-29 19:17:36 +02:00
Florian Nücke
9a8109b3f3 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
 2014-08-29 19:17:21 +02:00
Florian Nücke
f6f97e0d3f Made robots have a fixed (high) number of supported components instead of basing it on the CPU, so it's fully based on the complexity when assembling now. 2014-08-29 19:16:28 +02:00
Florian Nücke
1176e7b3f0 Reworked how complexity is computed when assembling robots. Cases now only provide a base level, CPUs control the max complexity in more detail (and don't contribute to complexity themselves anymore). Closes #522. 2014-08-29 18:59:15 +02:00
Florian Nücke
3d5029caa0 Implemented template system for assembler. 2014-08-29 18:22:31 +02:00
Florian Nücke
efba8bcea0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
 2014-08-28 08:51:58 +02:00
Florian Nücke
e2365d498d Also highlight slots for items hovered in NEI. 2014-08-28 08:27:42 +02:00
Florian Nücke
6761983cd6 Highlighting slots to indicate which items can go where in most GUIs. 2014-08-28 07:54:14 +02:00
Florian Nücke
bca05c812a Hi. 2014-08-28 00:18:50 +02:00
Florian Nücke
f4f5ade9e2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-28 00:17:24 +02:00
Florian Nücke
f7f59bff46 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2014-08-28 00:17:13 +02:00
Florian Nücke
75c7318784 Fffff. 2014-08-28 00:16:57 +02:00
Florian Nücke
5e53d832af Made cables render a little socket / plug when connected to blocks and some other stuff. 2014-08-28 00:05:25 +02:00
Florian "Sangar" Nücke
a7de0a237a Merge pull request #519 from logangorence/master 
Added a few Doctor Who robot names
 2014-08-27 19:59:34 +02:00